acquia / commons

modules/commons/commons_media/commons_media.private_files.inc

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
   foreach (commons_media_filter_parse_from_fields($entity_type, $entity) as $file_reference) {
     if (empty($entity_files[$file_reference['fid']])) {
       $entity_files[$file_reference['fid']] = 1;
-    }
-    else {
+    } else {
       $entity_files[$file_reference['fid']]++;
     }
   }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
           // Only move files that aren't currently in use.
           if (empty($usage)) {
             $scheme = 'private://';
-            $uri = file_stream_wrapper_uri_normalize($scheme . $source_file->filename);
+            $uri = file_stream_wrapper_uri_normalize($scheme.$source_file->filename);
             file_move($source_file, $uri, FILE_EXISTS_RENAME);
           }
         }

modules/commons/commons_trusted_contacts/commons_trusted_contacts.module

Braces +7 added lines, -14 removed lines

@@ -360,8 +360,7 @@ 
         // If user is blocked, they should not be able to apply for
         // membership.
         return;
-      }
-      elseif (og_is_member($entity_type, $id, 'user', $account, array(OG_STATE_PENDING))) {
+      } elseif (og_is_member($entity_type, $id, 'user', $account, array(OG_STATE_PENDING))) {
         // If user is pending, they should not be able to apply for
         // membership.
         $link = array(
@@ -373,8 +372,7 @@ 
           ),
         );
         $element[0][] = $link;
-      }
-      elseif (!og_is_member($entity_type, $id, 'user', $account, array(OG_STATE_ACTIVE))) {
+      } elseif (!og_is_member($entity_type, $id, 'user', $account, array(OG_STATE_ACTIVE))) {
         // Check if user can subscribe to the field.
         if (empty($settings['field_name']) && $audience_field_name = og_get_best_group_audience_field('user', $account, $entity_type, $bundle)) {
           $settings['field_name'] = $audience_field_name;
@@ -423,8 +421,7 @@ 
               array('system', 'jquery.form'),
             ),
           );
-        }
-        else {
+        } else {
           $link = array('#type' => 'link');
           $link['#href'] = 'user/login';
           $link['#options'] = array('query' => array('destination' => $url));
@@ -680,8 +677,7 @@ 
     $commands[] = ajax_command_replace('#user-' . $account->uid, trim(theme('html_tag__request_pending', $element)));
     $page = array('#type' => 'ajax', '#commands' => $commands);
     ajax_deliver($page);
-  }
-  else {
+  } else {
     drupal_goto('user/' . $og_membership->gid);
   }
 }
@@ -710,8 +706,7 @@ 
     $commands[] = ajax_command_replace(".field-name-group-group a", $new);
     $page = array('#type' => 'ajax', '#commands' => $commands);
     ajax_deliver($page);
-  }
-  else {
+  } else {
     drupal_goto('user/' . $account->uid);
   }
 }
@@ -843,8 +838,7 @@ 
         $commands[] = ajax_command_append('#messages', theme('status_messages'));
         $page = array('#type' => 'ajax', '#commands' => $commands);
         ajax_deliver($page);
-      }
-      else {
+      } else {
         drupal_goto();
       }
       return FALSE;
@@ -1289,8 +1283,7 @@ 
 function commons_trusted_contacts_batch_finished($success, $results, $operations) {
   if ($success) {
     $message = format_plural($results['processed'], t('One user processed.'), t('@count users processed.'));
-  }
-  else {
+  } else {
     $message = t('Error encountered while upgrading users.');
   }
 

Spacing +31 added lines, -31 removed lines

@@ -79,7 +79,7 @@ 
     'page callback' => 'commons_trusted_contacts_request_trust',
     'page arguments' => array(1, 3),
     'access callback' => 'commons_trusted_contacts_request_trust_access',
-    'access arguments' => array(1,2),
+    'access arguments' => array(1, 2),
     'type' => MENU_CALLBACK,
   );
 
@@ -262,20 +262,20 @@ 
   $view->get_total_rows = TRUE;
   $view->execute();
   $tabs['contacts'] = array(
-    'title' => t('Trusted Contacts') . ' <span class="commons-bw-result-count">' . $view->total_rows . '</span>',
+    'title' => t('Trusted Contacts').' <span class="commons-bw-result-count">'.$view->total_rows.'</span>',
     'contents' => views_embed_view('trusted_contacts'),
   );
 
   module_load_include('inc', 'privatemsg', 'privatemsg.pages');
 
   $tabs['messages'] = array(
-    'title' => t('Messages') . ' <span class="commons-bw-result-count">' . privatemsg_unread_count($account) . '</span>',
+    'title' => t('Messages').' <span class="commons-bw-result-count">'.privatemsg_unread_count($account).'</span>',
     'contents' => privatemsg_list_page(),
   );
 
 
   $tabs['invitations'] = array(
-    'title' => t('Invitations') . ' <span class="commons-bw-result-count">' . count(commons_trusted_contacts_get_pending_invitations($account->uid)) . '</span>',
+    'title' => t('Invitations').' <span class="commons-bw-result-count">'.count(commons_trusted_contacts_get_pending_invitations($account->uid)).'</span>',
     'contents' => views_embed_view('trusted_contacts_invitations'),
   );
 
@@ -336,7 +336,7 @@ 
       }
 
       // Hide the trust link from anonymous and users without subscribe access.
-      list($id, , $bundle) = entity_extract_ids($entity_type, $entity);
+      list($id,, $bundle) = entity_extract_ids($entity_type, $entity);
       $user_is_active_member = og_is_member($entity_type, $id, 'user', $account, array(OG_STATE_ACTIVE));
       if (!$account->uid || !og_user_access('user', $entity->uid, 'subscribe') && !$user_is_active_member) {
         return;
@@ -351,7 +351,7 @@ 
       if (variable_get('commons_trusted_contacts_global_messaging', FALSE) || $user_is_active_member) {
         $link = array('#type' => 'link');
         $link['#title'] = t('Message');
-        $link['#href'] = 'user/' . $user->uid . '/contacts/messages/popup/' . $id;
+        $link['#href'] = 'user/'.$user->uid.'/contacts/messages/popup/'.$id;
         // without an #options array template.php doesn't assign classes
         $link['#options'] = array();
         $element[0][] = $link;
@@ -400,7 +400,7 @@ 
           return $element;
         }
 
-        $token = drupal_get_token('request' . ':' . $id . ':' . $account->uid);
+        $token = drupal_get_token('request'.':'.$id.':'.$account->uid);
         $url = "request-trust/$id/$token/nojs";
 
         $link = array('#type' => 'link');
@@ -410,7 +410,7 @@ 
           $link['#options'] = array(
             'attributes' => array(
               'class' => array('use-ajax'),
-              'id' => 'user-' . $entity->uid
+              'id' => 'user-'.$entity->uid
             )
           );
           $element[0][] = $link;
@@ -441,11 +441,11 @@ 
 
     case 'approve_ignore':
 
-      $approve = l(t('Approve'), 'approve-trust/' . $entity->id . '/' . $items[0]['value']);
-      $ignore = l(t('Ignore'), 'ignore-trust/' . $entity->id . '/' . $items[0]['value']);
+      $approve = l(t('Approve'), 'approve-trust/'.$entity->id.'/'.$items[0]['value']);
+      $ignore = l(t('Ignore'), 'ignore-trust/'.$entity->id.'/'.$items[0]['value']);
 
       $element[0] = array(
-        '#markup' => $approve . ' ' . $ignore,
+        '#markup' => $approve.' '.$ignore,
       );
       return $element;
   }
@@ -544,7 +544,7 @@ 
 
   // Membership not found, return but throw an error to watchdog.
   if (!isset($return['og_membership'])) {
-    watchdog('commons_trusted_contacts', "Warning: expected trusted contact link not found between " . $og_membership->gid . " and " . $og_membership->etid, WATCHDOG_WARNING);
+    watchdog('commons_trusted_contacts', "Warning: expected trusted contact link not found between ".$og_membership->gid." and ".$og_membership->etid, WATCHDOG_WARNING);
     return;
   }
 
@@ -649,8 +649,8 @@ 
   $token = $wrapper->field_membership_token->value();
   $options = array('absolute' => TRUE);
   $arguments = array(
-    '@{approve-url}' => url('approve-trust/' . $og_membership->id . '/' . $token, $options),
-    '@{ignore-url}' => url('ignore-trust/' . $og_membership->id . '/' . $token, $options),
+    '@{approve-url}' => url('approve-trust/'.$og_membership->id.'/'.$token, $options),
+    '@{ignore-url}' => url('ignore-trust/'.$og_membership->id.'/'.$token, $options),
   );
   $message = message_create('trusted_contact_request_pending', array(
     'uid' => $account->uid,
@@ -677,12 +677,12 @@ 
       ),
     );
     // We trip due to https://api.drupal.org/comment/32698#comment-32698
-    $commands[] = ajax_command_replace('#user-' . $account->uid, trim(theme('html_tag__request_pending', $element)));
+    $commands[] = ajax_command_replace('#user-'.$account->uid, trim(theme('html_tag__request_pending', $element)));
     $page = array('#type' => 'ajax', '#commands' => $commands);
     ajax_deliver($page);
   }
   else {
-    drupal_goto('user/' . $og_membership->gid);
+    drupal_goto('user/'.$og_membership->gid);
   }
 }
 
@@ -703,8 +703,8 @@ 
   // Ajax
 
   if ($ajax == 'ajax') {
-    $token = drupal_get_token('request' . ':' . $account->uid . ':' . $user->uid);
-    $new = l(t('Trusted Contact'), 'request-trust/' . $account->uid . '/' . $token . '/nojs', array('attributes' => array('class' => array('use-ajax'))));
+    $token = drupal_get_token('request'.':'.$account->uid.':'.$user->uid);
+    $new = l(t('Trusted Contact'), 'request-trust/'.$account->uid.'/'.$token.'/nojs', array('attributes' => array('class' => array('use-ajax'))));
 
     $commands = array();
     $commands[] = ajax_command_replace(".field-name-group-group a", $new);
@@ -712,7 +712,7 @@ 
     ajax_deliver($page);
   }
   else {
-    drupal_goto('user/' . $account->uid);
+    drupal_goto('user/'.$account->uid);
   }
 }
 
@@ -755,7 +755,7 @@ 
   message_notify_send_message($message);
 
   // Redirect to Invitations screen.
-  drupal_goto('user/' . $user->uid . '/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations')));
+  drupal_goto('user/'.$user->uid.'/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations')));
 }
 
 /**
@@ -781,7 +781,7 @@ 
   $wrapper->save();
 
   // Redirect to Invitations screen.
-  drupal_goto('user/' . $user->uid . '/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations')));
+  drupal_goto('user/'.$user->uid.'/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations')));
 }
 
 /**
@@ -815,7 +815,7 @@ 
         t('You have exceeded the limit of @limit trusted contacts. Before you can add more contacts, you must <a href="@remove-contacts-links">remove some of your existing contacts.</a>',
           array(
             '@limit' => $contacts_limit,
-            '@remove-contacts-link' => url('user/' . $requestor->uid . '/contacts',
+            '@remove-contacts-link' => url('user/'.$requestor->uid.'/contacts',
               array(
                 'query' => array(
                   'qt-commons_trusted_contacts' => 'contacts',
@@ -863,7 +863,7 @@ 
 function commons_trusted_contacts_request_trust_access($account, $token) {
   global $user;
 
-  return drupal_valid_token($token, 'request' . ':' . $account->uid . ':' . $user->uid) && user_is_logged_in();
+  return drupal_valid_token($token, 'request'.':'.$account->uid.':'.$user->uid) && user_is_logged_in();
 }
 
 /**
@@ -876,7 +876,7 @@ 
 function commons_trusted_contacts_un_trust_access($account, $token) {
   global $user;
 
-  return drupal_valid_token($token, 'untrust' . ':' . $account->uid . ':' . $user->uid) && user_is_logged_in();
+  return drupal_valid_token($token, 'untrust'.':'.$account->uid.':'.$user->uid) && user_is_logged_in();
 }
 
 /**
@@ -960,7 +960,7 @@ 
   $form['actions']['cancel'] = array(
     '#type' => 'link',
     '#title' => t('Cancel'),
-    '#href' => 'user/' . $user->uid . '/contacts',
+    '#href' => 'user/'.$user->uid.'/contacts',
     '#options' => array(
       'query' => array('qt-commons_trusted_contacts' => 'messages'),
     ),
@@ -978,7 +978,7 @@ 
 
   if ($form['delete_destination']['#value'] == 'messages') {
     // TODO: Redirect to the messages quick-tab.
-    $form['delete_destination']['#value'] = 'user/' . $user->uid . '/contacts';
+    $form['delete_destination']['#value'] = 'user/'.$user->uid.'/contacts';
   }
 }
 
@@ -1028,7 +1028,7 @@ 
     // to perform the task of hiding the groups fields.
     '#attached' => array(
       'js' => array(
-        drupal_get_path('module', 'commons_trusted_contacts') . '/scripts/commons-trusted-contacts.js',
+        drupal_get_path('module', 'commons_trusted_contacts').'/scripts/commons-trusted-contacts.js',
       ),
     ),
   );
@@ -1127,7 +1127,7 @@ 
   $actions = array();
   $files = commons_trusted_contacts_operations_load_action_includes();
   foreach ($files as $filename) {
-    $action_info_fn = 'commons_trusted_contacts_' . str_replace('.', '_', basename($filename, '.inc')) . '_info';
+    $action_info_fn = 'commons_trusted_contacts_'.str_replace('.', '_', basename($filename, '.inc')).'_info';
     $action_info = call_user_func($action_info_fn);
     if (is_array($action_info)) {
       $actions += $action_info;
@@ -1148,7 +1148,7 @@ 
 function commons_trusted_contacts_operations_load_action_includes() {
   static $loaded = FALSE;
 
-  $path = drupal_get_path('module', 'commons_trusted_contacts') . '/includes/actions/';
+  $path = drupal_get_path('module', 'commons_trusted_contacts').'/includes/actions/';
   $files = array(
     'set_state_active.action.inc',
     'set_state_blocked.action.inc',
@@ -1157,7 +1157,7 @@ 
 
   if (!$loaded) {
     foreach ($files as $file) {
-      include_once $path . $file;
+      include_once $path.$file;
     }
     $loaded = TRUE;
   }
@@ -1177,7 +1177,7 @@ 
   // Include original functions.
   module_load_include('inc', 'privatemsg', 'privatemsg.pages');
 
-  $form = privatemsg_new($form, $form_state, $account->uid, 'New private message from ' . $user->name);
+  $form = privatemsg_new($form, $form_state, $account->uid, 'New private message from '.$user->name);
 
   $form['actions'] = array('#type' => 'actions');
 

Doc Comments +1 added lines, -1 removed lines

@@ -1141,7 +1141,7 @@
  * Loads the VBO actions placed in their own include files.
  *
  * @return
- *   An array of containing filenames of the included actions.
+ string[]   An array of containing filenames of the included actions.
  *
  * @see views_bulk_operations_load_action_includes()
  */

modules/commons/commons_documents/commons_documents.commons.inc

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
  */
 function commons_documents_commons_bw_create_all_widget($group) {
   if (og_user_access('node', $group->nid, 'create document content')) {
-    $link = l(t('Create a document'),'node/add/document',
+    $link = l(t('Create a document'), 'node/add/document',
       array('attributes' => array('class' => 'commons-documents-create'), 'query' => array('og_group_ref' => $group->nid))
     );
     return array(

modules/commons/commons_events/modules/commons_events_solr/commons_events_solr.module

Braces +1 added lines, -2 removed lines

@@ -263,8 +263,7 @@
 
   if (node_access('create', 'event')) {
     return t('There are no events. Be the first to <a href="!url">create one</a>!', array('!url' => url('node/add/event')));
-  }
-  else {
+  } else {
     return t('There are no events. Be the first to create one!');
   }
 }

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  * Get the search adapter and Solr environment for dynamic faceting.
  */
 function commons_events_solr_search_environment() {
-  return "apachesolr@" . apachesolr_default_environment();
+  return "apachesolr@".apachesolr_default_environment();
 }
 
 /**
@@ -23,9 +23,9 @@ 
   if (empty($env_id)) {
     $env_id = commons_events_solr_search_environment();
   }
-  foreach($facets as $facet) {
+  foreach ($facets as $facet) {
     $facet['settings'] = serialize($facet['settings']);
-    $facet['name'] = $env_id . $facet['name'];
+    $facet['name'] = $env_id.$facet['name'];
     $facet['searcher'] = $env_id;
     $merge = db_merge('facetapi')
       ->key(array('name' => $facet['name']))
@@ -222,8 +222,8 @@ 
  * Get the panels subtype for the facet block.
  */
 function commons_events_solr_panel_facet_subtype($facet_name) {
-  $facet_name = commons_events_solr_search_environment() . ':block:' . $facet_name;
-  return 'facetapi-' . facetapi_hash_delta($facet_name);
+  $facet_name = commons_events_solr_search_environment().':block:'.$facet_name;
+  return 'facetapi-'.facetapi_hash_delta($facet_name);
 }
 
 /**
@@ -274,7 +274,7 @@ 
  */
 function commons_events_solr_environment_form_submit($form, $form_state) {
   if ($form_state['values']['make_default'] == 1) {
-    commons_events_solr_create_facets('apachesolr@' . $form_state['build_info']['args']['0']['env_id']);
+    commons_events_solr_create_facets('apachesolr@'.$form_state['build_info']['args']['0']['env_id']);
     // Need to clear caches so we can rebuild block definitions.
     cache_clear_all('*', 'cache_block', TRUE);
     cache_clear_all('*', 'cache_apachesolr', TRUE);

Doc Comments +2 added lines

@@ -16,6 +16,7 @@ 
 /**
  * Dynamically create facets rather than let Features do it, so we can have
  * facets based on the current default Solr environment.
+ * @param string $env_id
  */
 function commons_events_solr_create_facets($env_id = NULL) {
   $facets = commons_events_solr_facet_definitions();
@@ -220,6 +221,7 @@ 
 
 /**
  * Get the panels subtype for the facet block.
+ * @param string $facet_name
  */
 function commons_events_solr_panel_facet_subtype($facet_name) {
   $facet_name = commons_events_solr_search_environment() . ':block:' . $facet_name;

modules/commons/commons_events/includes/commons_events.theme.inc

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
     && registration_access('create', $registration, $user, $registration->type)
     && registration_status('node', $event->nid, TRUE)) {
     return drupal_get_form('commons_events_attend_event_form_' . $event->nid, $event, $registration, $attendee_count);
-  }
-  elseif (registration_is_registered($registration, NULL, $user->uid) &&
+  } elseif (registration_is_registered($registration, NULL, $user->uid) &&
     registration_access('delete', $registration, $user, $registration->type)) {
     $query = new EntityFieldQuery();
     $query->entityCondition('entity_type', 'registration')

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
   if (!registration_is_registered($registration, NULL, $user->uid)
     && registration_access('create', $registration, $user, $registration->type)
     && registration_status('node', $event->nid, TRUE)) {
-    return drupal_get_form('commons_events_attend_event_form_' . $event->nid, $event, $registration, $attendee_count);
+    return drupal_get_form('commons_events_attend_event_form_'.$event->nid, $event, $registration, $attendee_count);
   }
   elseif (registration_is_registered($registration, NULL, $user->uid) &&
     registration_access('delete', $registration, $user, $registration->type)) {
@@ -42,7 +42,7 @@ 
       ->propertyCondition('entity_type', 'node');
     $result = $query->execute();
 
-    return drupal_get_form('commons_events_cancel_event_form_' . $event->nid, $event, $result['registration']);
+    return drupal_get_form('commons_events_cancel_event_form_'.$event->nid, $event, $result['registration']);
   }
   return "";
 }
@@ -51,15 +51,15 @@ 
  * Theme the event attendees list.
  */
 function theme_commons_events_event_attendees($variables = array()) {
-  $title = '<p class="commons-events-attendees-title">' . t('Attendees') . '</p>';
+  $title = '<p class="commons-events-attendees-title">'.t('Attendees').'</p>';
   $event_nid = $variables['event_nid'];
   if (!isset($variables['display'])
     || $variables['display'] != 'full') {
-    return $title . views_embed_view('commons_events_event_attendee_list', 'default', $event_nid)
-      . '<p class="commons-events-all-attendees"><a href="/node/' . $event_nid . '/attendees">'
-      . t('See all attendees') . '</a></p>';
+    return $title.views_embed_view('commons_events_event_attendee_list', 'default', $event_nid)
+      . '<p class="commons-events-all-attendees"><a href="/node/'.$event_nid.'/attendees">'
+      . t('See all attendees').'</a></p>';
   }
-  return $title . views_embed_view(
+  return $title.views_embed_view(
     'commons_events_event_attendee_list',
     'commons_events_full_attendee_list',
     $event_nid);

modules/commons/commons_events/includes/commons_events.forms.inc

Braces +3 added lines, -6 removed lines

@@ -74,8 +74,7 @@ 
     || !registration_has_room('node', $form_state['event_node']->nid)) {
     form_set_error('submit', t('The event you are registering for is unavailable.'));
     return FALSE;
-  }
-  elseif (registration_is_registered($form_state['registration'], NULL, $user->uid)) {
+  } elseif (registration_is_registered($form_state['registration'], NULL, $user->uid)) {
     form_set_error('submit', t('You are already registered for this event.'));
     return FALSE;
   }
@@ -100,8 +99,7 @@ 
     if (module_exists('commons_follow_node')) {
       commons_follow_node_follow_node($registration->entity_id, 'event', $user->uid);
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('There was an error saving your registration.'));
   }
 }
@@ -135,8 +133,7 @@ 
   if ($attendee_count > 1) {
     // Single attending message.
     $markup = t('You are attending with @guests', array('@guests' => format_plural($attendee_count, '1 guest', '@count guests')));
-  }
-  else {
+  } else {
     $markup = t('You are attending.');
   }
 

Indentation +4 added lines, -4 removed lines

@@ -4,10 +4,10 @@
  * Commons Events form declarations.
  */
 
- /**
- * Form builder for Attend call to action on events, as long as registration
- * is available onsite.
- */
+  /**
+   * Form builder for Attend call to action on events, as long as registration
+   * is available onsite.
+   */
 function commons_events_attend_event_form($form, &$form_state, $event_node, $registration = NULL, $attendee_count = 0) {
   $form_state['event_node'] = $event_node;
   if (!registration_status('node', $event_node->nid, TRUE)) {

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     '#markup' => format_plural($attendee_count, '<span class="commons-event-count">1</span> attendee', '<span class="commons-event-count">@count</span> attendees'),
   );
   $form['#attached']['css'] = array(
-    drupal_get_path('module', 'commons_events') . '/css/commons_events.css',
+    drupal_get_path('module', 'commons_events').'/css/commons_events.css',
   );
   $form['#attributes'] = array('class' => array('commons-events-form-float'));
   return $form;
@@ -114,7 +114,7 @@ 
 
   $form['#attributes'] = array('class' => array('commons-events-form-float'));
   $form['#attached']['css'] = array(
-    drupal_get_path('module', 'commons_events') . '/css/commons_events.css',
+    drupal_get_path('module', 'commons_events').'/css/commons_events.css',
   );
   $form['registration'] = array(
     '#type' => 'value',

modules/commons/commons_events/commons_events.module

Braces +5 added lines, -10 removed lines

@@ -389,8 +389,7 @@ 
     if (!isset($node->uid)) {
       global $user;
       $uid = $user->uid;
-    }
-    else {
+    } else {
       $uid = $node->uid;
     }
 
@@ -582,16 +581,14 @@ 
   // If the difference is over a year, use the simple formatter.
   if ($variables['dates']['value']['db']['object']->difference($variables['dates']['value2']['db']['object'], 'years') > 0) {
     return theme('commons_events_date_display_range_simple', $variables);
-  }
-  else {
+  } else {
     if ($variables['dates']['value']['db']['object']->difference($variables['dates']['value2']['db']['object'], 'months') > 0) {
       $variables['dates']['value']['db']['object']->limitGranularity(array('day', 'month'));
       $variables['dates']['value2']['db']['object']->limitGranularity(array('day', 'month', 'year'));
 
       $date1 = $variables['dates']['value']['db']['object']->format($variables['dates']['format'], FALSE);
       $date2 = $variables['dates']['value2']['db']['object']->format($variables['dates']['format'], FALSE);
-    }
-    else {
+    } else {
       if ($variables['dates']['value']['db']['object']->difference($variables['dates']['value2']['db']['object'], 'days') > 0) {
         // If the Day is before the month (Europe, etc) then switch the granularity.
         if (strpos($variables['dates']['format'], 'M') != 0 || strpos($variables['dates']['format'], 'm') != 0 ||
@@ -599,8 +596,7 @@ 
         ) {
           $variables['dates']['value']['db']['object']->limitGranularity(array('day'));
           $variables['dates']['value2']['db']['object']->limitGranularity(array('day', 'month', 'year'));
-        }
-        else {
+        } else {
           $variables['dates']['value']['db']['object']->limitGranularity(array('month', 'day'));
           $variables['dates']['value2']['db']['object']->limitGranularity(array('day', 'year'));
         }
@@ -613,8 +609,7 @@ 
         if (strpbrk($variables['dates']['format'], 'Dl')) {
           return theme('commons_events_date_display_range_simple', $variables);
         }
-      }
-      else {
+      } else {
         return theme('commons_events_date_display_range_simple', $variables);
       }
     }

Spacing +18 added lines, -18 removed lines

@@ -203,7 +203,7 @@ 
   if ($type == 'node' && isset($build['#node'])) {
     $node = $build['#node'];
 
-    list(, , $bundle) = entity_extract_ids('node', $node);
+    list(,, $bundle) = entity_extract_ids('node', $node);
 
     if ($bundle == 'event') {
       $build['attending'] = array(
@@ -234,7 +234,7 @@ 
 function commons_events_form_node_form_alter(&$form, &$form_state, $form_id) {
   $node = $form_state['node'];
 
-  list(, , $bundle) = entity_extract_ids('node', $node);
+  list(,, $bundle) = entity_extract_ids('node', $node);
 
   if ($bundle == 'event' && empty($node->nid)) {
     drupal_set_title(t('Create an event'));
@@ -242,8 +242,8 @@ 
 
   if ($bundle == 'event') {
     // Attach custom CSS and JS to the form.
-    $form['#attached']['css'][] = drupal_get_path('module', 'commons_events') . '/css/commons_events.css';
-    $form['#attached']['js'][] = drupal_get_path('module', 'commons_events') . '/js/commons_events.js';
+    $form['#attached']['css'][] = drupal_get_path('module', 'commons_events').'/css/commons_events.css';
+    $form['#attached']['js'][] = drupal_get_path('module', 'commons_events').'/js/commons_events.js';
 
     // Remove the '-None-' option from all the dropdowns.
     unset($form['field_location'][$form['field_location']['#language']]['#options']['_none']);
@@ -255,7 +255,7 @@ 
     // Default the event organizer to the user who is creating the node.
     if (empty($form['field_organizers'][$form['field_organizers']['#language']]['#default_value'])) {
       global $user;
-      $form['field_organizers'][$form['field_organizers']['#language']]['#default_value'] = format_username($user) . " (" . $user->uid . ")";
+      $form['field_organizers'][$form['field_organizers']['#language']]['#default_value'] = format_username($user)." (".$user->uid.")";
     }
 
     // Hide the Registration type field.
@@ -444,7 +444,7 @@ 
   if (module_exists('commons_events_solr')) {
     $options = array(
       'query' => array(
-        'f[1]' => 'sm_og_group_ref:node:' . $group_id,
+        'f[1]' => 'sm_og_group_ref:node:'.$group_id,
       ),
     );
 
@@ -465,11 +465,11 @@ 
  */
 function commons_events_views_post_execute(&$view) {
   if ($view->name == 'commons_events_upcoming' && $view->current_display == 'panel_pane_1') {
-    $view->attachment_after = '<div class="more-link">' . commons_events_upcoming_more_link($view->args[0]) . '</div>';
+    $view->attachment_after = '<div class="more-link">'.commons_events_upcoming_more_link($view->args[0]).'</div>';
   }
 
   if ($view->name == 'commons_events_upcoming' && $view->current_display == 'panel_pane_2') {
-    $view->attachment_before = '<div class="commons-event-count">' . format_plural(count($view->result), '1 event', '@count events') . '</div>';
+    $view->attachment_before = '<div class="commons-event-count">'.format_plural(count($view->result), '1 event', '@count events').'</div>';
   }
 }
 
@@ -542,17 +542,17 @@ 
   if ($date1 == $date2) {
     // Wrap the result with the attributes.
     return t('!start-time - !end-time', array(
-      '!start-time' => '<span class="date-display-start"' . drupal_attributes($attributes_start) . '>' . $time1 . '</span>',
-      '!end-time' => '<span class="date-display-end"' . drupal_attributes($attributes_end) . '>' . $time2 . $timezone . '</span>',
+      '!start-time' => '<span class="date-display-start"'.drupal_attributes($attributes_start).'>'.$time1.'</span>',
+      '!end-time' => '<span class="date-display-end"'.drupal_attributes($attributes_end).'>'.$time2.$timezone.'</span>',
     ));
   }
 
   // Wrap the result with the attributes.
   return t('!start-date to !end-date, !start-time - !end-time', array(
-    '!start-date' => '<span class="date-display-start"' . drupal_attributes($attributes_start) . '>' . $date1 . '</span>',
-    '!end-date' => '<span class="date-display-end"' . drupal_attributes($attributes_end) . '>' . $date2 . '</span>',
-    '!start-time' => '<span class="date-display-start"' . drupal_attributes($attributes_start) . '>' . $time1 . '</span>',
-    '!end-time' => '<span class="date-display-end"' . drupal_attributes($attributes_end) . '>' . $time2 . $timezone . '</span>',
+    '!start-date' => '<span class="date-display-start"'.drupal_attributes($attributes_start).'>'.$date1.'</span>',
+    '!end-date' => '<span class="date-display-end"'.drupal_attributes($attributes_end).'>'.$date2.'</span>',
+    '!start-time' => '<span class="date-display-start"'.drupal_attributes($attributes_start).'>'.$time1.'</span>',
+    '!end-time' => '<span class="date-display-end"'.drupal_attributes($attributes_end).'>'.$time2.$timezone.'</span>',
   ));
 }
 
@@ -621,10 +621,10 @@ 
   }
   // Wrap the result with the attributes.
   return t('!start-date to !end-date, !start-time - !end-time', array(
-    '!start-date' => '<span class="date-display-start"' . drupal_attributes($attributes_start) . '>' . $date1 . '</span>',
-    '!end-date' => '<span class="date-display-end"' . drupal_attributes($attributes_end) . '>' . $date2 . '</span>',
-    '!start-time' => '<span class="date-display-start"' . drupal_attributes($attributes_start) . '>' . $time1 . '</span>',
-    '!end-time' => '<span class="date-display-end"' . drupal_attributes($attributes_end) . '>' . $time2 . $timezone . '</span>',
+    '!start-date' => '<span class="date-display-start"'.drupal_attributes($attributes_start).'>'.$date1.'</span>',
+    '!end-date' => '<span class="date-display-end"'.drupal_attributes($attributes_end).'>'.$date2.'</span>',
+    '!start-time' => '<span class="date-display-start"'.drupal_attributes($attributes_start).'>'.$time1.'</span>',
+    '!end-time' => '<span class="date-display-end"'.drupal_attributes($attributes_end).'>'.$time2.$timezone.'</span>',
   ));
 }
 

modules/commons/commons_q_a/commons_q_a.commons.inc

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
  */
 function commons_q_a_commons_bw_create_all_widget($group) {
   if (og_user_access('node', $group->nid, 'create question content')) {
-    $link = l(t('Ask a question'),'node/add/question',
+    $link = l(t('Ask a question'), 'node/add/question',
       array('attributes' => array('class' => 'commons-q-a-create'), 'query' => array('og_group_ref' => $group->nid))
     );
     return array(

modules/commons/commons_q_a/commons_q_a.module

Braces +3 added lines, -6 removed lines

@@ -130,8 +130,7 @@ 
 
     if (user_is_anonymous()) {
       $account = drupal_anonymous_user();
-    }
-    else {
+    } else {
       $account = $user;
     }
 
@@ -302,12 +301,10 @@ 
   if ($results['rating'] > 0) {
     $score = $results['rating'];
     $score_class = 'positive';
-  }
-  elseif ($results['rating'] < 0) {
+  } elseif ($results['rating'] < 0) {
     $score = $results['rating'];
     $score_class = 'negative';
-  }
-  else {
+  } else {
     $score = 0;
     $score_class = 'neutral';
   }

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
             'attributes' => array(
               'title' => t('Answer this question'),
             ),
-            'href' => 'node/' . $node->nid,
+            'href' => 'node/'.$node->nid,
             'fragment' => 'answer',
           ),
         ),
@@ -157,7 +157,7 @@ 
       }
       $answer_form = drupal_get_form('answer_node_form', $node);
       $answer_form['header'] = array(
-        '#markup' => '<h3 id="answer" name="answer">' . t('Add a new answer') . '</h3>',
+        '#markup' => '<h3 id="answer" name="answer">'.t('Add a new answer').'</h3>',
         '#weight' => -10,
       );
       // Hide any vertical tabs that might be present.
@@ -202,7 +202,7 @@ 
 function commons_q_a_form_node_form_alter(&$form, &$form_state, $form_id) {
   $node = $form['#node'];
 
-  list(, , $bundle) = entity_extract_ids('node', $node);
+  list(,, $bundle) = entity_extract_ids('node', $node);
 
   if ($bundle == 'question' && empty($node->nid)) {
     drupal_set_title(t('Ask a question'));
@@ -236,7 +236,7 @@ 
     $form['container']['comment_body'] = $form['comment_body'];
     $form['container']['actions'] = $form['actions'];
     unset($form['author']);
-    unset($form['subject']);  // We don't need a subject, they're pointless within comments.
+    unset($form['subject']); // We don't need a subject, they're pointless within comments.
     unset($form['comment_body']);
     unset($form['actions']);
   }
@@ -258,7 +258,7 @@ 
  */
 function commons_q_a_answer_submit($form, &$form_state) {
   // Redirect the user back to the related question.
-  $form_state['redirect'] = 'node/' . $form_state['values']['field_related_question'][LANGUAGE_NONE][0]['target_id'];
+  $form_state['redirect'] = 'node/'.$form_state['values']['field_related_question'][LANGUAGE_NONE][0]['target_id'];
 }
 
 /**
@@ -339,7 +339,7 @@ 
     array(-1, 'down'),
   );
   $templates['commons_thumbs_up_down']->theme = 'rate_template_commons_thumbs_up_down';
-  $templates['commons_thumbs_up_down']->css = drupal_get_path('module', 'commons_q_a') . '/commons-thumbs-up-down.css';
+  $templates['commons_thumbs_up_down']->css = drupal_get_path('module', 'commons_q_a').'/commons-thumbs-up-down.css';
   $templates['commons_thumbs_up_down']->customizable = FALSE;
   $templates['commons_thumbs_up_down']->translate = TRUE;
   $templates['commons_thumbs_up_down']->use_source_translation = TRUE;