acquia / commons

themes/commons/commons_origins/template.php

Braces +18 added lines, -36 removed lines

@@ -38,8 +38,7 @@ 
       foreach($words as &$word) {
         if(is_numeric($word)) {
           $word = '<span class="notification-count">' . $word . '</span>';
-        }
-        else {
+        } else {
           $word = '<span class="notification-label element-invisible">' . $word . '</span>';
         }
       }
@@ -321,8 +320,7 @@ 
           if ($name != 'comment_forbidden' && $name != 'answer-add' && !is_string($link['attributes']['class'])) {
             $link['attributes']['class'][] = 'action-item-small';
             $link['attributes']['class'][] = 'action-item-inline';
-          }
-          elseif ($name != 'comment_forbidden' && $name != 'answer-add') {
+          } elseif ($name != 'comment_forbidden' && $name != 'answer-add') {
             $link['attributes']['class'] .= ' action-item-small action-item-inline';
           }
         }
@@ -343,8 +341,7 @@ 
     foreach ($chunks as &$chunk) {
       if ($chunk == $variables['comment_count']) {
         $chunk = '<span class="action-item-small-append">' . $variables['comment_count'] . '</span>';
-      }
-      else {
+      } else {
         $chunk = '<span class="element-invisible">' . $chunk . '</span>';
       }
     }
@@ -473,8 +470,7 @@ 
     // Style the flag links like buttons.
     if ($variables['last_action'] == 'flagged') {
       $variables['flag_classes_array'][] = 'action-item-small-active';
-    }
-    else {
+    } else {
       $variables['flag_classes_array'][] = 'action-item-small';
     }
     $variables['flag_classes'] = implode(' ', $variables['flag_classes_array']);
@@ -612,8 +608,7 @@ 
   foreach ($view->result as $id => $result) {
     if (isset($result->node_type)) {
       $variables['classes_array'][$id] .= ' ' . drupal_html_class('row-type-' . $result->node_type);
-    }
-    else if (($view->name == 'commons_events_upcoming' && $view->override_path != 'events') || $view->name == 'commons_events_user_upcoming_events') {
+    } else if (($view->name == 'commons_events_upcoming' && $view->override_path != 'events') || $view->name == 'commons_events_user_upcoming_events') {
       $variables['classes_array'][$id] .= ' ' . drupal_html_class('row-type-event');
     }
   }
@@ -651,8 +646,7 @@ 
   // Roll the classes into the attributes.
   if (empty($variables['attributes_array']['class'])) {
     $variables['attributes_array']['class'] = $variables['classes_array'];
-  }
-  else {
+  } else {
     $variables['attributes_array']['class'] = array_merge($variables['attributes_array']['class'], $variables['classes_array']);
   }
 
@@ -834,8 +828,7 @@ 
     return '<span class="' . $classes . '" id="rate-button-' . $id . '">' .
       '<span class="element-invisible">' . check_plain($text) . '</span>' .
       '</span>';
-  }
-  else {
+  } else {
     return '<a class="' . $classes . '" id="rate-button-' . $id . '" rel="nofollow" href="' . htmlentities($href) . '" title="' . check_plain($text) . '">' .
       '<span class="element-invisible">' . check_plain($text) . '</span>' .
       '</a>';
@@ -851,8 +844,7 @@ 
   if (is_array($form['#theme'])) {
     $hooks = array('form_content');
     $form['#theme'] = array_merge($form['#theme'], $hooks);
-  }
-  else {
+  } else {
     $form['#theme'] = array(
       $form['#theme'],
       'form_content',
@@ -1000,8 +992,7 @@ 
         if (isset($link['href'])) {
           // Pass in $link as $options, they share the same keys.
           $output .= l($link['title'], $link['href'], $link);
-        }
-        elseif (!empty($link['title'])) {
+        } elseif (!empty($link['title'])) {
           // Some links are actually not links, but we wrap these in <span> for adding title and class attributes.
           if (empty($link['html'])) {
             $link['title'] = check_plain($link['title']);
@@ -1098,8 +1089,7 @@ 
         }
         if (isset($item['#href']) && strpos($item['#href'], 'messages')) {
           $item['#options']['attributes']['class'][] = 'message-contact';
-        }
-        elseif (isset($item['#href'])) {
+        } elseif (isset($item['#href'])) {
           $item['#options']['attributes']['class'][] = 'trusted-status-request';
         }
       }
@@ -1118,8 +1108,7 @@ 
 
   if (!isset($element['#value'])) {
     return '<' . $element['#tag'] . $attributes . " />\n";
-  }
-  else {
+  } else {
     $output = '<' . $element['#tag'] . $attributes . '>';
     if (isset($element['#value_prefix'])) {
       $output .= $element['#value_prefix'];
@@ -1152,8 +1141,7 @@ 
     if (isset($item['#type']) && $item['#type'] == 'link') {
       if (strpos($item['#href'], '/subscribe')) {
         $item['#options']['attributes']['class'][] = 'action-item-primary';
-      }
-      else {
+      } else {
         $item['#options']['attributes']['class'][] = 'action-item';
       }
     }
@@ -1181,8 +1169,7 @@ 
     // validating that the administrative area has been populated.
     if (!empty($address['#address']['administrative_area'])) {
       _commons_origins_format_address($address);
-    }
-    else {
+    } else {
       // Deny access to incomplete addresses.
       $address['#access'] = FALSE;
     }
@@ -1220,8 +1207,7 @@ 
         // If an address is incomplete, remove it and tell the system a
         // rebuild is needed.
         unset($variables['row']->field_field_address[$key]);
-      }
-      else {
+      } else {
         _commons_origins_format_address($address['rendered']);
       }
     }
@@ -1294,8 +1280,7 @@ 
   if (module_exists('timeago') && variable_get('timeago_node', 1)) {
     $variables['date'] = timeago_format_date($node->created, $variables['date']);
     $use_timeago_date_format = TRUE;
-  }
-  else {
+  } else {
     $use_timeago_date_format = FALSE;
   }
 
@@ -1318,16 +1303,13 @@ 
       $placeholders['!group'] = l($wrapper->{OG_AUDIENCE_FIELD}->get(0)->label(), 'node/' . $wrapper->{OG_AUDIENCE_FIELD}->get(0)->getIdentifier());
       if ($use_timeago_date_format == TRUE) {
         $variables['submitted'] = t('!type created !date in the !group group by !user', $placeholders);
-      }
-      else {
+      } else {
         $variables['submitted'] = t('!type created @interval ago in the !group group by !user', $placeholders);
       }
-    }
-    else {
+    } else {
       if ($use_timeago_date_format == TRUE) {
         $variables['submitted'] = t('!type created !date by !user', $placeholders);
-      }
-      else {
+      } else {
         $variables['submitted'] = t('!type created @interval ago by !user', $placeholders);
       }
     }

Spacing +72 added lines, -72 removed lines

@@ -15,7 +15,7 @@ 
     // @see commons_origins_form_alter().
     'form_content' => array(
       'render element' => 'form',
-      'path' => drupal_get_path('theme', 'commons_origins') . '/templates/form',
+      'path' => drupal_get_path('theme', 'commons_origins').'/templates/form',
       'template' => 'form-content',
       'pattern' => 'form_content__',
     ),
@@ -35,12 +35,12 @@ 
   foreach ($iconify as $name) {
     if (isset($element[$name])) {
       $words = explode(' ', $element[$name]['title']);
-      foreach($words as &$word) {
-        if(is_numeric($word)) {
-          $word = '<span class="notification-count">' . $word . '</span>';
+      foreach ($words as &$word) {
+        if (is_numeric($word)) {
+          $word = '<span class="notification-count">'.$word.'</span>';
         }
         else {
-          $word = '<span class="notification-label element-invisible">' . $word . '</span>';
+          $word = '<span class="notification-label element-invisible">'.$word.'</span>';
         }
       }
       $element[$name]['title'] = implode(' ', $words);
@@ -59,7 +59,7 @@ 
   // Video and rich type must have HTML content.
   // Wrap the HTML content in a <div> to allow it to be made responsive.
   if (in_array($type, array('video', 'rich'))) {
-    $variables['content'] = '<div class="oembed">' . $content . '</div>';
+    $variables['content'] = '<div class="oembed">'.$content.'</div>';
   }
 }
 
@@ -103,12 +103,12 @@ 
 function commons_origins_apachesolr_search_browse_blocks($vars) {
   $result = '';
   if ($vars['content']['#children']) {
-    $result .= '<div class="apachesolr-browse-blocks">' . "\n";
-    $result .= '  <h2 class="search-results-title">' . t('Browse available categories') . '</h2>' . "\n";
-    $result .= '  <div class="commons-pod">' . "\n";
-    $result .= '    <p>' . t('Pick a category to launch a search.') . '</p>' . "\n";
-    $result .= $vars['content']['#children'] . "\n";
-    $result .= '  </div>' . "\n";
+    $result .= '<div class="apachesolr-browse-blocks">'."\n";
+    $result .= '  <h2 class="search-results-title">'.t('Browse available categories').'</h2>'."\n";
+    $result .= '  <div class="commons-pod">'."\n";
+    $result .= '    <p>'.t('Pick a category to launch a search.').'</p>'."\n";
+    $result .= $vars['content']['#children']."\n";
+    $result .= '  </div>'."\n";
     $result .= '</div>';
   }
 
@@ -192,7 +192,7 @@ 
     $variables['classes_array'] = array_merge($variables['classes_array'], $variables['message_classes']);
   }
   $variables['classes_array'][] = 'clearfix';
-  $variables['attributes_array']['id'] = 'privatemsg-mid-' . $variables['mid'];
+  $variables['attributes_array']['id'] = 'privatemsg-mid-'.$variables['mid'];
   $variables['content_attributes_array']['class'][] = 'privatemsg-message-content';
 
   // Add a distinct class to the "Delete" action.
@@ -214,7 +214,7 @@ 
   $output = '';
   $path_to_at_core = drupal_get_path('theme', 'adaptivetheme');
 
-  include_once($path_to_at_core . '/inc/get.inc');
+  include_once($path_to_at_core.'/inc/get.inc');
 
   global $theme_key;
   $theme_name = $theme_key;
@@ -229,15 +229,15 @@ 
 
   if (at_get_setting('extra_menu_classes', $theme_name) == 1 && !empty($element['#original_link'])) {
     if (!empty($element['#original_link']['depth'])) {
-      $element['#attributes']['class'][] = 'menu-depth-' . $element['#original_link']['depth'];
+      $element['#attributes']['class'][] = 'menu-depth-'.$element['#original_link']['depth'];
     }
     if (!empty($element['#original_link']['mlid'])) {
-      $element['#attributes']['class'][] = 'menu-item-' . $element['#original_link']['mlid'];
+      $element['#attributes']['class'][] = 'menu-item-'.$element['#original_link']['mlid'];
     }
   }
 
   if (at_get_setting('menu_item_span_elements', $theme_name) == 1 && !empty($element['#title'])) {
-    $element['#title'] = '<span>' . $element['#title'] . '</span>';
+    $element['#title'] = '<span>'.$element['#title'].'</span>';
     $element['#localized_options']['html'] = TRUE;
   }
 
@@ -246,15 +246,15 @@ 
   }
 
   $output = l($element['#title'], $element['#href'], $element['#localized_options']);
-  return '<li' . drupal_attributes($element['#attributes']) . '>' . $output . $sub_menu . "</li>";
+  return '<li'.drupal_attributes($element['#attributes']).'>'.$output.$sub_menu."</li>";
 }
 
 /**
  * Helper function to examine menu links and return the appropriate class.
  */
-function commons_origins_menu_link_class(&$element)  {
+function commons_origins_menu_link_class(&$element) {
   if ($element['#original_link']['menu_name'] == 'main-menu') {
-    $element['#attributes']['class'][] = drupal_html_class($element['#original_link']['menu_name'] . '-' . $element['#original_link']['router_path']);
+    $element['#attributes']['class'][] = drupal_html_class($element['#original_link']['menu_name'].'-'.$element['#original_link']['router_path']);
   }
 }
 
@@ -279,7 +279,7 @@ 
 
   // Only load the media styles if Commons Media is enabled.
   if (module_exists('commons_media')) {
-    drupal_add_css(drupal_get_path('theme', 'commons_origins') . '/css/commons-media.css', array('media' => 'screen', 'group' => CSS_THEME));
+    drupal_add_css(drupal_get_path('theme', 'commons_origins').'/css/commons-media.css', array('media' => 'screen', 'group' => CSS_THEME));
   }
 }
 
@@ -342,10 +342,10 @@ 
     // Add appropriate classes to words in the title.
     foreach ($chunks as &$chunk) {
       if ($chunk == $variables['comment_count']) {
-        $chunk = '<span class="action-item-small-append">' . $variables['comment_count'] . '</span>';
+        $chunk = '<span class="action-item-small-append">'.$variables['comment_count'].'</span>';
       }
       else {
-        $chunk = '<span class="element-invisible">' . $chunk . '</span>';
+        $chunk = '<span class="element-invisible">'.$chunk.'</span>';
       }
     }
     $comments_link['title'] = implode(' ', $chunks);
@@ -399,7 +399,7 @@ 
     'field_related_question',
     'field_topics',
   );
-  foreach($related_information as $field) {
+  foreach ($related_information as $field) {
     if (!empty($variables['content'][$field])) {
       $variables['content']['related_information'][$field] = $variables['content'][$field];
       hide($variables['content'][$field]);
@@ -509,13 +509,13 @@ 
  */
 function commons_origins_preprocess_panelizer_view_mode(&$variables, $hook) {
   // Add classed to identity the entity type being overridden.
-  $variables['classes_array'][] = drupal_html_class('panelizer-' . $variables['element']['#entity_type']);
-  $variables['title_attributes_array']['class'][] = drupal_html_class($variables['element']['#entity_type'] . '-title');
-  $variables['title_attributes_array']['class'][] = drupal_html_class('panelizer-' . $variables['element']['#entity_type'] . '-title');
+  $variables['classes_array'][] = drupal_html_class('panelizer-'.$variables['element']['#entity_type']);
+  $variables['title_attributes_array']['class'][] = drupal_html_class($variables['element']['#entity_type'].'-title');
+  $variables['title_attributes_array']['class'][] = drupal_html_class('panelizer-'.$variables['element']['#entity_type'].'-title');
 
   // Add some extra theme hooks for the subthemers.
-  $variables['hook_theme_suggestions'][] = $hook . '__' . $variables['element']['#entity_type'];
-  $variables['hook_theme_suggestions'][] = $hook . '__' . $variables['element']['#entity_type'] . '__' . $variables['element']['#bundle'];
+  $variables['hook_theme_suggestions'][] = $hook.'__'.$variables['element']['#entity_type'];
+  $variables['hook_theme_suggestions'][] = $hook.'__'.$variables['element']['#entity_type'].'__'.$variables['element']['#bundle'];
 }
 
 /**
@@ -611,10 +611,10 @@ 
   // node type information.
   foreach ($view->result as $id => $result) {
     if (isset($result->node_type)) {
-      $variables['classes_array'][$id] .= ' ' . drupal_html_class('row-type-' . $result->node_type);
+      $variables['classes_array'][$id] .= ' '.drupal_html_class('row-type-'.$result->node_type);
     }
     else if (($view->name == 'commons_events_upcoming' && $view->override_path != 'events') || $view->name == 'commons_events_user_upcoming_events') {
-      $variables['classes_array'][$id] .= ' ' . drupal_html_class('row-type-event');
+      $variables['classes_array'][$id] .= ' '.drupal_html_class('row-type-event');
     }
   }
 }
@@ -622,7 +622,7 @@ 
 /**
  * Implements hook_preprocess_pager().
  */
-function commons_origins_preprocess_pager_link (&$variables, $hook) {
+function commons_origins_preprocess_pager_link(&$variables, $hook) {
   // Style pager links like buttons.
   $variables['attributes']['class'][] = 'action-item';
   $variables['attributes']['class'][] = 'action-item-inline';
@@ -685,7 +685,7 @@ 
   }
 
   // Set an identifying class to the event attendance form.
-  if(strpos($element['#id'], 'commons-events-attend-event-form') === 0) {
+  if (strpos($element['#id'], 'commons-events-attend-event-form') === 0) {
     $variables['attributes_array']['class'][] = 'node-actions';
   }
 
@@ -760,7 +760,7 @@ 
     $variables['form']['actions']['submit']['#attributes']['class'][] = 'action-item-primary';
 
     if (isset($variables['form']['title'])) {
-      $variables['form']['title']['#markup'] = '<h3 class="partial-node-form-title">' . $variables['form']['title']['#markup'] . '</h3>';
+      $variables['form']['title']['#markup'] = '<h3 class="partial-node-form-title">'.$variables['form']['title']['#markup'].'</h3>';
     }
   }
 
@@ -827,17 +827,17 @@ 
 
   $classes = 'rate-button';
   if ($class) {
-    $classes .= ' ' . $class;
+    $classes .= ' '.$class;
   }
   if (empty($href)) {
     // Widget is disabled or closed.
-    return '<span class="' . $classes . '" id="rate-button-' . $id . '">' .
-      '<span class="element-invisible">' . check_plain($text) . '</span>' .
+    return '<span class="'.$classes.'" id="rate-button-'.$id.'">'.
+      '<span class="element-invisible">'.check_plain($text).'</span>'.
       '</span>';
   }
   else {
-    return '<a class="' . $classes . '" id="rate-button-' . $id . '" rel="nofollow" href="' . htmlentities($href) . '" title="' . check_plain($text) . '">' .
-      '<span class="element-invisible">' . check_plain($text) . '</span>' .
+    return '<a class="'.$classes.'" id="rate-button-'.$id.'" rel="nofollow" href="'.htmlentities($href).'" title="'.check_plain($text).'">'.
+      '<span class="element-invisible">'.check_plain($text).'</span>'.
       '</a>';
   }
 }
@@ -929,10 +929,10 @@ 
 function commons_origins_css_alter(&$css) {
   // Remove preset styles that interfere with theming.
   $unset = array(
-    drupal_get_path('module', 'search') . '/search.css',
-    drupal_get_path('module', 'rich_snippets') . '/rich_snippets.css',
-    drupal_get_path('module', 'commons_like') . '/commons-like.css',
-    drupal_get_path('module', 'panels') . '/css/panels.css',
+    drupal_get_path('module', 'search').'/search.css',
+    drupal_get_path('module', 'rich_snippets').'/rich_snippets.css',
+    drupal_get_path('module', 'commons_like').'/commons-like.css',
+    drupal_get_path('module', 'panels').'/css/panels.css',
   );
   foreach ($unset as $path) {
     if (isset($css[$path])) {
@@ -969,14 +969,14 @@ 
           'level' => 'h2',
         );
       }
-      $output .= '<' . $heading['level'];
+      $output .= '<'.$heading['level'];
       if (!empty($heading['class'])) {
         $output .= drupal_attributes(array('class' => $heading['class']));
       }
-      $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
+      $output .= '>'.check_plain($heading['text']).'</'.$heading['level'].'>';
     }
 
-    $output .= '<ul' . drupal_attributes($attributes) . '>';
+    $output .= '<ul'.drupal_attributes($attributes).'>';
 
     $num_links = count($links);
     $i = 1;
@@ -995,7 +995,7 @@ 
         if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page())) && (empty($link['language']) || $link['language']->language == $language_url->language)) {
           $class[] = 'active';
         }
-        $output .= '<li' . drupal_attributes(array('class' => $class)) . '>';
+        $output .= '<li'.drupal_attributes(array('class' => $class)).'>';
 
         if (isset($link['href'])) {
           // Pass in $link as $options, they share the same keys.
@@ -1010,7 +1010,7 @@ 
           if (isset($link['attributes'])) {
             $span_attributes = drupal_attributes($link['attributes']);
           }
-          $output .= '<span' . $span_attributes . '>' . $link['title'] . '</span>';
+          $output .= '<span'.$span_attributes.'>'.$link['title'].'</span>';
         }
 
         $i++;
@@ -1034,14 +1034,14 @@ 
   element_set_attributes($element, array('id'));
   _form_set_class($element, array('form-wrapper'));
 
-  $output = '<fieldset' . drupal_attributes($element['#attributes']) . '>';
+  $output = '<fieldset'.drupal_attributes($element['#attributes']).'>';
   if (!empty($element['#title'])) {
     // Always wrap fieldset legends in a SPAN for CSS positioning.
-    $output .= '<legend><span class="fieldset-legend">' . $element['#title'] . '</span></legend>';
+    $output .= '<legend><span class="fieldset-legend">'.$element['#title'].'</span></legend>';
   }
   $output .= '<div class="fieldset-wrapper">';
   if (!empty($element['#description'])) {
-    $output .= '<div class="fieldset-description">' . $element['#description'] . '</div>';
+    $output .= '<div class="fieldset-description">'.$element['#description'].'</div>';
   }
   $output .= $element['#children'];
   if (isset($element['#value'])) {
@@ -1049,7 +1049,7 @@ 
   }
   $output .= '</div>';
   $output .= "</fieldset>\n";
-  return '<div class="fieldset-outer-wrapper">' . $output . '</div>';
+  return '<div class="fieldset-outer-wrapper">'.$output.'</div>';
 }
 
 /**
@@ -1117,10 +1117,10 @@ 
   $attributes = drupal_attributes($element['#attributes']);
 
   if (!isset($element['#value'])) {
-    return '<' . $element['#tag'] . $attributes . " />\n";
+    return '<'.$element['#tag'].$attributes." />\n";
   }
   else {
-    $output = '<' . $element['#tag'] . $attributes . '>';
+    $output = '<'.$element['#tag'].$attributes.'>';
     if (isset($element['#value_prefix'])) {
       $output .= $element['#value_prefix'];
     }
@@ -1128,7 +1128,7 @@ 
     if (isset($element['#value_suffix'])) {
       $output .= $element['#value_suffix'];
     }
-    $output .= '</' . $element['#tag'] . ">\n";
+    $output .= '</'.$element['#tag'].">\n";
     return $output;
   }
 }
@@ -1143,11 +1143,11 @@ 
 
   // Render the label, if it's not hidden.
   if (!$variables['label_hidden']) {
-    $output .= '<div class="field-label"' . $variables['title_attributes'] . '>' . $variables['label'] . ':&nbsp;</div>';
+    $output .= '<div class="field-label"'.$variables['title_attributes'].'>'.$variables['label'].':&nbsp;</div>';
   }
 
   // Render the items.
-  $output .= '<div class="field-items"' . $variables['content_attributes'] . '>';
+  $output .= '<div class="field-items"'.$variables['content_attributes'].'>';
   foreach ($variables['items'] as $delta => $item) {
     if (isset($item['#type']) && $item['#type'] == 'link') {
       if (strpos($item['#href'], '/subscribe')) {
@@ -1158,13 +1158,13 @@ 
       }
     }
 
-    $classes = 'field-item ' . ($delta % 2 ? 'odd' : 'even');
-    $output .= '<div class="' . $classes . '"' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
+    $classes = 'field-item '.($delta % 2 ? 'odd' : 'even');
+    $output .= '<div class="'.$classes.'"'.$variables['item_attributes'][$delta].'>'.drupal_render($item).'</div>';
   }
   $output .= '</div>';
 
   // Render the top-level DIV.
-  $output = '<div class="' . $variables['classes'] . '"' . $variables['attributes'] . '>' . $output . '</div>';
+  $output = '<div class="'.$variables['classes'].'"'.$variables['attributes'].'>'.$output.'</div>';
 
   return $output;
 }
@@ -1176,7 +1176,7 @@ 
   $output = '';
 
   // Add Microformat classes to each address.
-  foreach($variables['items'] as &$address) {
+  foreach ($variables['items'] as &$address) {
     // Only display an address if it has been populated. We determine this by
     // validating that the administrative area has been populated.
     if (!empty($address['#address']['administrative_area'])) {
@@ -1190,19 +1190,19 @@ 
 
   // Render the label, if it's not hidden.
   if (!$variables['label_hidden']) {
-    $output .= '<div class="field-label"' . $variables['title_attributes'] . '>' . $variables['label'] . ':</div> ';
+    $output .= '<div class="field-label"'.$variables['title_attributes'].'>'.$variables['label'].':</div> ';
   }
 
   // Render the items.
-  $output .= '<div class="field-items"' . $variables['content_attributes'] . '>';
+  $output .= '<div class="field-items"'.$variables['content_attributes'].'>';
   foreach ($variables['items'] as $delta => $item) {
-    $classes = 'field-item ' . ($delta % 2 ? 'odd' : 'even');
-    $output .= '<div class="' . $classes . '"' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
+    $classes = 'field-item '.($delta % 2 ? 'odd' : 'even');
+    $output .= '<div class="'.$classes.'"'.$variables['item_attributes'][$delta].'>'.drupal_render($item).'</div>';
   }
   $output .= '</div>';
 
   // Render the top-level DIV.
-  $output = '<div class="' . $variables['classes'] . '"' . $variables['attributes'] . '>' . $output . '</div>';
+  $output = '<div class="'.$variables['classes'].'"'.$variables['attributes'].'>'.$output.'</div>';
 
   return $output;
 }
@@ -1260,7 +1260,7 @@ 
         $variables['user_profile'][$action]['#access'] = FALSE;
       }
     }
-    if (!module_exists('commons_trusted_contacts') && isset(  $variables['user_profile']['user_actions']['group_group'])) {
+    if (!module_exists('commons_trusted_contacts') && isset($variables['user_profile']['user_actions']['group_group'])) {
       $variables['user_profile']['user_actions']['group_group']['#access'] = FALSE;
     }
     if (!empty($variables['user_profile']['user_actions'])) {
@@ -1301,21 +1301,21 @@ 
 
   // Replace the submitted text on nodes with something a bit more pertinent to
   // the content type.
-  if (variable_get('node_submitted_' . $node->type, TRUE)) {
+  if (variable_get('node_submitted_'.$node->type, TRUE)) {
     $node_type_info = node_type_get_type($variables['node']);
     $type_attributes = array('class' => array(
       'node-content-type',
-      drupal_html_class('node-content-type-' . $node->type),
+      drupal_html_class('node-content-type-'.$node->type),
     ));
     $placeholders = array(
-      '!type' => '<span' . drupal_attributes($type_attributes) . '>' . check_plain($node_type_info->name) . '</span>',
+      '!type' => '<span'.drupal_attributes($type_attributes).'>'.check_plain($node_type_info->name).'</span>',
       '!user' => $variables['name'],
       '!date' => $variables['date'],
       '@interval' => format_interval(REQUEST_TIME - $node->created),
     );
     // Show what group the content belongs to if applicable.
     if (!empty($node->{OG_AUDIENCE_FIELD}) && $wrapper->{OG_AUDIENCE_FIELD}->count() == 1) {
-      $placeholders['!group'] = l($wrapper->{OG_AUDIENCE_FIELD}->get(0)->label(), 'node/' . $wrapper->{OG_AUDIENCE_FIELD}->get(0)->getIdentifier());
+      $placeholders['!group'] = l($wrapper->{OG_AUDIENCE_FIELD}->get(0)->label(), 'node/'.$wrapper->{OG_AUDIENCE_FIELD}->get(0)->getIdentifier());
       if ($use_timeago_date_format == TRUE) {
         $variables['submitted'] = t('!type created !date in the !group group by !user', $placeholders);
       }
@@ -1335,6 +1335,6 @@ 
 
   // Append a feature label to featured node teasers.
   if ($variables['teaser'] && $variables['promote']) {
-    $variables['submitted'] .= ' <span class="featured-node-tooltip">' . t('Featured') . ' ' . $variables['type'] . '</span>';
+    $variables['submitted'] .= ' <span class="featured-node-tooltip">'.t('Featured').' '.$variables['type'].'</span>';
   }
 }

modules/commons/commons_bw/includes/views/handlers/commons_bw_handler_node_partial_form.inc

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
     $permission = "create $bundle content";
     if ($group_id && !og_user_access('node', $group_id, $permission)) {
       return;
-    }
-    elseif (!user_access($permission)) {
+    } elseif (!user_access($permission)) {
       return;
     }
 

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     // should be moved to this position from previously rendered form.
     // See partial_node_form.js.
     if (!empty($cache[$bundle])) {
-      return '<div class="partial-node-form-placeholder" data-bundle="' . $bundle . '"></div>';
+      return '<div class="partial-node-form-placeholder" data-bundle="'.$bundle.'"></div>';
     }
     $cache[$bundle] = TRUE;
 

modules/commons/commons_bw/commons_bw.module

Braces +4 added lines, -8 removed lines

@@ -118,11 +118,9 @@ 
 
   if(!empty($form_state['field'][$field_name][LANGUAGE_NONE]['instance']['display_in_partial_form'])) {
     $display_default = $form_state['field'][$field_name][LANGUAGE_NONE]['instance']['display_in_partial_form'];
-  }
-  else if (isset($form_state['build_info']['args'][0]['display_in_partial_form'])) {
+  } else if (isset($form_state['build_info']['args'][0]['display_in_partial_form'])) {
     $display_default = $form_state['build_info']['args'][0]['display_in_partial_form'];
-  }
-  else {
+  } else {
     $display_default = FALSE;
   }
 
@@ -174,13 +172,11 @@ 
   if (module_exists('locale')) {
     if (locale_multilingual_node_type($node->type)) {
       $node->language = $language->language;
-    }
-    else {
+    } else {
       $default = language_default();
       $node->language = $default->language;
     }
-  }
-  else {
+  } else {
     $node->language = LANGUAGE_NONE;
   }
 

Spacing +15 added lines, -15 removed lines

@@ -46,7 +46,7 @@ 
 
   if (!isset($node_types)) {
     foreach (module_implements('node_info') as $module) {
-      $node_types[$module] = call_user_func($module . '_node_info');
+      $node_types[$module] = call_user_func($module.'_node_info');
     }
   }
 
@@ -95,7 +95,7 @@ 
  */
 function commons_bw_form_views_exposed_form_alter(&$form, &$form_state, $form_id) {
   // Implements tweaks to exposed filters and sorts per the Commons designs.
-  if (strpos($form['#id'],'views-exposed-form-commons-bw') === 0) {
+  if (strpos($form['#id'], 'views-exposed-form-commons-bw') === 0) {
     // Remove the sort order (eg, descending vs ascending).
     $form['sort_order']['#access'] = FALSE;
     $form['sort_by']['#title'] = t('Sorted by');
@@ -116,7 +116,7 @@ 
   // See if we're building for the first time, or getting pre-saved values.
   $field_name = $form['#field']['field_name'];
 
-  if(!empty($form_state['field'][$field_name][LANGUAGE_NONE]['instance']['display_in_partial_form'])) {
+  if (!empty($form_state['field'][$field_name][LANGUAGE_NONE]['instance']['display_in_partial_form'])) {
     $display_default = $form_state['field'][$field_name][LANGUAGE_NONE]['instance']['display_in_partial_form'];
   }
   else if (isset($form_state['build_info']['args'][0]['display_in_partial_form'])) {
@@ -155,7 +155,7 @@ 
   $instances = field_info_instances('node', $bundle);
 
   // Remove all fields except those marked as "display_in_partial_form".
-  foreach($instances as $field_name => $instance) {
+  foreach ($instances as $field_name => $instance) {
     if (empty($instance['display_in_partial_form'])) {
       unset($instances[$field_name]);
     }
@@ -186,7 +186,7 @@ 
 
   field_attach_form('node', $node, $form, $form_state, entity_language('node', $node));
 
-  foreach(element_children($form) as $field_name) {
+  foreach (element_children($form) as $field_name) {
     if (empty($instances[$field_name])) {
       $form[$field_name]['#access'] = FALSE;
     }
@@ -230,7 +230,7 @@ 
   // Attach the browsing widget JS and give it a higher weight than
   // quicktabs.js.
   $form['#attached']['js'][] = array(
-    'data' => drupal_get_path('module', 'commons_bw') . '/js/partial_node_form.js',
+    'data' => drupal_get_path('module', 'commons_bw').'/js/partial_node_form.js',
     'type' => 'file',
     'weight' => 100,
   );
@@ -238,13 +238,13 @@ 
   // Add in some descriptive classes for css down the line.
   $form['#attributes']['class'][] = 'node';
   $form['#attributes']['class'][] = 'commons-bw-partial-node-form';
-  $form['#attributes']['class'][] = 'commons-bw-partial-node-form-' . $bundle;
+  $form['#attributes']['class'][] = 'commons-bw-partial-node-form-'.$bundle;
 
   // Add a link to the full node form.
   $form['full_form'] = array(
     '#theme' => 'link',
     '#text' => t('Go to full form'),
-    '#path' => 'node/add/' . str_replace('_', '-', $bundle),
+    '#path' => 'node/add/'.str_replace('_', '-', $bundle),
     '#options' => array(
       'attributes' => array('class' => array('full-form')),
       'html' => FALSE,
@@ -356,7 +356,7 @@ 
  *   An array of return values of the hook implementations.
  */
 function commons_bw_get_tab_definitions($widget_type = 'group') {
-  $hook_name = 'commons_bw_' . $widget_type . '_widget';
+  $hook_name = 'commons_bw_'.$widget_type.'_widget';
 
   $tabs = module_invoke_all($hook_name);
 
@@ -399,7 +399,7 @@ 
   uasort($items, 'element_sort');
 
   foreach ($items as $module => $item) {
-    $links[] = $item['link'] . ' ' . $item['text'];
+    $links[] = $item['link'].' '.$item['text'];
 
     // Populate the default content creation link.
     if (isset($item['default']) && $item['default']) {
@@ -410,10 +410,10 @@ 
   $output = '';
 
   if (!empty($default)) {
-    $output .= $default['link'] . '<a class="commons-bw-create-choose"><span></span></a>';
+    $output .= $default['link'].'<a class="commons-bw-create-choose"><span></span></a>';
   }
 
-  $output .= '<div class="commons-bw-create-choose-bg"></div><div class="commons-bw-create-choose-holder">' . theme('item_list', array('items' => $links, 'type' => 'ul', 'attributes' => array('class' => 'commons-bw-create-all-widget-types'))) . '</div>';
+  $output .= '<div class="commons-bw-create-choose-bg"></div><div class="commons-bw-create-choose-holder">'.theme('item_list', array('items' => $links, 'type' => 'ul', 'attributes' => array('class' => 'commons-bw-create-all-widget-types'))).'</div>';
 
   return $output;
 }
@@ -463,7 +463,7 @@ 
       $view->execute();
 
       // Append the result count to the tab title.
-      $tabs[$machine_name]['title'] = $tabs[$machine_name]['title'] . ' <span class="commons-bw-result-count">'. $view->total_rows . '</span>';
+      $tabs[$machine_name]['title'] = $tabs[$machine_name]['title'].' <span class="commons-bw-result-count">'.$view->total_rows.'</span>';
     }
 
     // Use the current tab as the quicktabs default if the tab settings specify.
@@ -482,7 +482,7 @@ 
   $path = drupal_get_path('module', 'commons_bw');
 
   return array(
-    $path . '/plugins/quicktabs_styles/commons_pills/commons_pills.css' => t('Commons Pills'),
-    $path . '/plugins/quicktabs_styles/commons_tabs/commons_tabs.css' => t('Commons Tabs'),
+    $path.'/plugins/quicktabs_styles/commons_pills/commons_pills.css' => t('Commons Pills'),
+    $path.'/plugins/quicktabs_styles/commons_tabs/commons_tabs.css' => t('Commons Tabs'),
   );
 }

modules/commons/commons_search/commons_search.module

Braces +3 added lines, -6 removed lines

@@ -44,8 +44,7 @@ 
       // We're using faceted core search, so change Site search key to reflect
       // the change of search engines.
       $site_key = 'o-search_facetapi';
-    }
-    else {
+    } else {
       if (module_exists('apachesolr_search')) {
         // Are we using Apache Solr? If so change the Site search key to reflect
         // the change of search engines.
@@ -106,14 +105,12 @@ 
       // specified group.
       $qm = (strpos($form_state['redirect'], '?') !== FALSE ? '' : '?');
       $form_state['redirect'] .= $qm . '&f[1]=sm_og_group_ref:node:' . $form_state['search_group_id'];
-    }
-    else {
+    } else {
       // Using core search to search within a group doesn't work, so we simply
       // use a view with exposed search terms to do the searching.
       drupal_goto('search/group/' . $form_state['search_group_id'], array('query' => array('keys' => $keys)));
     }
-  }
-  else {
+  } else {
     if ($form_state['values']['custom_search_types'] == 'c-user') {
       // Force update the redirect on User search since Custom Search is weird.
       $keys = check_plain($form_state['values']['search_block_form']);

Spacing +5 added lines, -5 removed lines

@@ -87,7 +87,7 @@ 
     $keys = arg(2);
     if (!module_exists('commons_search_solr') && !empty($keys)) {
       // Remove the search keys from the form action only if we're using core search.
-      $form['#action'] = str_replace("/" . check_plain(arg(2)), '', $form['#action']);
+      $form['#action'] = str_replace("/".check_plain(arg(2)), '', $form['#action']);
     }
   }
 }
@@ -105,19 +105,19 @@ 
       // Add on a filter to the solr query to only list results within the
       // specified group.
       $qm = (strpos($form_state['redirect'], '?') !== FALSE ? '' : '?');
-      $form_state['redirect'] .= $qm . '&f[1]=sm_og_group_ref:node:' . $form_state['search_group_id'];
+      $form_state['redirect'] .= $qm.'&f[1]=sm_og_group_ref:node:'.$form_state['search_group_id'];
     }
     else {
       // Using core search to search within a group doesn't work, so we simply
       // use a view with exposed search terms to do the searching.
-      drupal_goto('search/group/' . $form_state['search_group_id'], array('query' => array('keys' => $keys)));
+      drupal_goto('search/group/'.$form_state['search_group_id'], array('query' => array('keys' => $keys)));
     }
   }
   else {
     if ($form_state['values']['custom_search_types'] == 'c-user') {
       // Force update the redirect on User search since Custom Search is weird.
       $keys = check_plain($form_state['values']['search_block_form']);
-      $form_state['redirect'] = 'search/user/' . $keys;
+      $form_state['redirect'] = 'search/user/'.$keys;
     }
   }
 }
@@ -134,7 +134,7 @@ 
     && preg_match('/sm_og_group_ref:"node:([0-9]+)"&/', urldecode($variables['response']->request), $match)
   ) {
     $group = node_load($match[1]);
-    $title = t('Search within !group', array('!group' => '<em>' . $group->title . '</em>'));
+    $title = t('Search within !group', array('!group' => '<em>'.$group->title.'</em>'));
     $variables['title'] = $title;
   }
 }

modules/commons/commons_topics/commons_topics.features.field_instance.inc

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
   $commons_groups_entity_types = commons_topics_get_entity_types_with_topics();
   if (!empty($commons_groups_entity_types)) {
     foreach ($commons_groups_entity_types as $entity_type => $bundles) {
-      foreach(array_keys($bundles) as $bundle) {
+      foreach (array_keys($bundles) as $bundle) {
         commons_topics_field_definition($field_instances, $entity_type, $bundle);
       }
     }

modules/commons/commons_posts/commons_posts.commons.inc

Spacing +1 added lines, -1 removed lines

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

modules/commons/commons_groups/commons_groups.module

Braces +9 added lines, -18 removed lines

@@ -71,8 +71,7 @@ 
       set, an administrator can dismiss the update notice.") . '</p>';
     if ($path == 'admin/content/groups/update') {
       return $message;
-    }
-    elseif ($arg[0] == 'node' && $arg[2] == 'edit') {
+    } elseif ($arg[0] == 'node' && $arg[2] == 'edit') {
       $node = menu_get_object();
       if($node->type == 'group' && empty($node->field_og_subscribe_settings)) {
         return $message;
@@ -178,11 +177,9 @@ 
 
   if (!empty($permissions['subscribe without approval'])) {
     $subscribe_type = 'anyone';
-  }
-  elseif (!empty($permissions['subscribe'])) {
+  } elseif (!empty($permissions['subscribe'])) {
     $subscribe_type = 'approval';
-  }
-  else {
+  } else {
     $subscribe_type = 'invitation';
   }
 
@@ -313,8 +310,7 @@ 
       $topics_text .= '!topic-' . $topic->tid;
       if ($topic == end($topics)) {
         $topics_text .= '.';
-      }
-      else {
+      } else {
         $topics_text .= ', ';
       }
       $t_args['!topic-' . $topic->tid] = l(t($topic->name), 'taxonomy/term/' . $topic->tid);
@@ -971,8 +967,7 @@ 
       if (!empty($account->picture->uri)) {
         $filepath = $account->picture->uri;
       }
-    }
-    elseif (variable_get('user_picture_default', '')) {
+    } elseif (variable_get('user_picture_default', '')) {
       $filepath = variable_get('user_picture_default', '');
     }
 
@@ -1099,8 +1094,7 @@ 
         $links['href'] = "group/$entity_type/$id/unsubscribe";
       }
     }
-  }
-  else {
+  } else {
     // 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;
@@ -1147,13 +1141,11 @@ 
           $links['title'] = t('Join group');
           if ($account->uid) {
             $links['href'] = $url;
-          }
-          else {
+          } else {
             $links['href'] = 'user/login';
             $links['options'] = array('query' => array('destination' => $url));
           }
-        }
-        else {
+        } else {
           $element[0] = array('#markup' => '<div class="subscription-type">' . t('Invite-only group') . '</div>');
           return $element;
         }
@@ -1228,8 +1220,7 @@ 
       foreach ($roles as $rid => $rolename) {
         if (in_array($rolename, $details['roles'])) {
           $grant[$rid][] = $perm;
-        }
-        else {
+        } else {
           $revoke[$rid][] = $perm;
         }
       }

Spacing +26 added lines, -26 removed lines

@@ -28,7 +28,7 @@ 
   $hidden_permissions = array('subscribe', 'subscribe without approval');
   foreach ($hidden_permissions as $permission) {
     if (isset($form['permission'][$permission])) {
-      $form['permission'][$permission]['#markup'] .= ' ' . t('<strong>Disabled by the Commons Groups module.<strong>');
+      $form['permission'][$permission]['#markup'] .= ' '.t('<strong>Disabled by the Commons Groups module.<strong>');
     }
     foreach ($form['checkboxes'] as $index => $elements) {
       if (isset($elements['#options'][$permission])) {
@@ -67,14 +67,14 @@ 
  */
 function commons_groups_help($path, $arg) {
   if (variable_get('commons_groups_needs_update', FALSE)) {
-    $message =  '<p>' . t("Drupal Commons 3.3 added a new, required field to control group privacy. Please edit your group(s) select one of the privacy options. Once all groups are
-      set, an administrator can dismiss the update notice.") . '</p>';
+    $message = '<p>'.t("Drupal Commons 3.3 added a new, required field to control group privacy. Please edit your group(s) select one of the privacy options. Once all groups are
+      set, an administrator can dismiss the update notice.").'</p>';
     if ($path == 'admin/content/groups/update') {
       return $message;
     }
     elseif ($arg[0] == 'node' && $arg[2] == 'edit') {
       $node = menu_get_object();
-      if($node->type == 'group' && empty($node->field_og_subscribe_settings)) {
+      if ($node->type == 'group' && empty($node->field_og_subscribe_settings)) {
         return $message;
       }
     }
@@ -97,7 +97,7 @@ 
     $breadcrumb[] = l(t('Groups'), 'groups');
     $group = node_load($entity->og_group_ref[LANGUAGE_NONE][0]['target_id']);
     if (node_access('view', $group)) {
-      $breadcrumb[] = l($group->title, 'node/' . $group->nid);
+      $breadcrumb[] = l($group->title, 'node/'.$group->nid);
     }
     drupal_set_breadcrumb($breadcrumb);
   }
@@ -109,7 +109,7 @@ 
 function commons_groups_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);
 
   // Customizations to the node form for entities that are group content.
   $group_content_entity_types = commons_groups_get_group_content_entity_types();
@@ -135,14 +135,14 @@ 
       // is selected.
       $form['field_og_access_default_value']['#states'] = array(
         'visible' => array(
-          ':input[name="field_og_subscribe_settings[' . LANGUAGE_NONE . ']"]' => array('value' => 'approval'),
+          ':input[name="field_og_subscribe_settings['.LANGUAGE_NONE.']"]' => array('value' => 'approval'),
         ),
       );
 
       $form['#after_build'] = array('commons_groups_form_group_node_after_build');
     }
 
-    $form['#attached']['css'][] = drupal_get_path('module', 'commons_groups') . '/css/commons_groups.css';
+    $form['#attached']['css'][] = drupal_get_path('module', 'commons_groups').'/css/commons_groups.css';
 
     // The group access is set on commons_groups_node_presave().
     $form['group_access'][LANGUAGE_NONE]['#required'] = FALSE;
@@ -299,7 +299,7 @@ 
       return '';
     }
     $contributors_count = $view->total_rows;
-    $output .= l(format_plural($contributors_count, '1 contributor', '@count contributors'), 'node/' . $group->nid . '/contributors');
+    $output .= l(format_plural($contributors_count, '1 contributor', '@count contributors'), 'node/'.$group->nid.'/contributors');
   }
   // Format the list of topics:
   if (!empty($group->field_topics[LANGUAGE_NONE])) {
@@ -310,14 +310,14 @@ 
     $topics_text = ' discussing the @topics ';
     $t_args = array('@topics' => format_plural(count($topics), 'topic', 'topics'));
     foreach ($topics as $topic) {
-      $topics_text .= '!topic-' . $topic->tid;
+      $topics_text .= '!topic-'.$topic->tid;
       if ($topic == end($topics)) {
         $topics_text .= '.';
       }
       else {
         $topics_text .= ', ';
       }
-      $t_args['!topic-' . $topic->tid] = l(t($topic->name), 'taxonomy/term/' . $topic->tid);
+      $t_args['!topic-'.$topic->tid] = l(t($topic->name), 'taxonomy/term/'.$topic->tid);
     }
     $output .= t($topics_text, $t_args);
   }
@@ -361,7 +361,7 @@ 
   if ($form_id == 'edit_profile_user_profile_form' || substr($form_id, -10) === '_node_form') {
     $internal_fields = array('field_unread_invitations', 'field_unread_messages', 'user_trusted_contacts', 'og_user_group_ref', 'group_access');
     foreach ($internal_fields as $field_name) {
-      if(isset($form[$field_name])) {
+      if (isset($form[$field_name])) {
         $form[$field_name]['#access'] = FALSE;
       }
     }
@@ -381,7 +381,7 @@ 
 function commons_groups_node_in_group_submit(&$form, &$form_state) {
   if (isset($form_state['values']['og_group_ref'][LANGUAGE_NONE][0])) {
     $group = $form_state['values']['og_group_ref'][LANGUAGE_NONE][0]['target_id'];
-    $form_state['redirect'] = 'node/' . $group;
+    $form_state['redirect'] = 'node/'.$group;
   }
 }
 
@@ -454,7 +454,7 @@ 
 
   if (!isset($commons_entity_integrations)) {
     foreach (module_implements('commons_entity_integration') as $module) {
-      $commons_entity_integrations[$module] = call_user_func($module . '_commons_entity_integration');
+      $commons_entity_integrations[$module] = call_user_func($module.'_commons_entity_integration');
     }
   }
 
@@ -647,14 +647,14 @@ 
 function commons_groups_related_groups_text($related_groups) {
   // In 1 group: "in the x group"
   if (count($related_groups) == 1) {
-    return t(' in the !group group', array('!group' => l($related_groups[0]->title, 'node/' . $related_groups[0]->nid)));
+    return t(' in the !group group', array('!group' => l($related_groups[0]->title, 'node/'.$related_groups[0]->nid)));
   }
 
   // In 2 groups: "in the x and y groups"
   if (count($related_groups) == 2) {
     return t(' in the !group-0 and !group-1 groups', array(
-      '!group-0' => l($related_groups[0]->title, 'node/' . $related_groups[0]->nid),
-      '!group-1' => l($related_groups[1]->title, 'node/' . $related_groups[1]->nid),
+      '!group-0' => l($related_groups[0]->title, 'node/'.$related_groups[0]->nid),
+      '!group-1' => l($related_groups[1]->title, 'node/'.$related_groups[1]->nid),
     ));
   }
 
@@ -666,11 +666,11 @@ 
     // Prepare tokens for t() for each of the other groups.
     foreach ($related_groups as $key => $this_group) {
       $text .= "!group-$key, ";
-      $t_args["!group-$key"] = l($this_group->title, 'node/' . $this_group->nid);
+      $t_args["!group-$key"] = l($this_group->title, 'node/'.$this_group->nid);
     }
     // Prepare the last group token.
     $text .= " and !group-$last_group->nid groups.";
-    $t_args["!group-$last_group->nid"] = l($last_group->title, 'node/' . $last_group->nid);
+    $t_args["!group-$last_group->nid"] = l($last_group->title, 'node/'.$last_group->nid);
     // Prepare the full text with all of the groups and their tokens:
     return t($text, $t_args);
   }
@@ -753,7 +753,7 @@ 
     // Determine whether the group is private according to the subscription
     // field.
     $private = $wrapper->field_og_subscribe_settings->value() == 'invitation';
-    $wrapper->{OG_ACCESS_FIELD}->set((int)$private);
+    $wrapper->{OG_ACCESS_FIELD}->set((int) $private);
     return;
   }
 
@@ -988,7 +988,7 @@ 
             'alt' => $alt,
           ),
           '#path' => array(
-            'path' => 'user/' . $account->uid,
+            'path' => 'user/'.$account->uid,
             'options' => array(
               'attributes' => array(
                 'title' => t("View @user's profile.", array('@user' => format_username($account))),
@@ -1073,12 +1073,12 @@ 
     return $element;
   }
 
-  list($id, , $bundle) = entity_extract_ids($entity_type, $entity);
+  list($id,, $bundle) = entity_extract_ids($entity_type, $entity);
 
   // The user has a pending membership request. Let her know that
   // her request is pending review.
   if (og_is_member($entity_type, $id, 'user', $account, array(OG_STATE_PENDING))) {
-    $element[0] = array('#markup' => '<div class="subscription-type">' . t('Your membership request is pending review by a group organizer.') . '</div>');
+    $element[0] = array('#markup' => '<div class="subscription-type">'.t('Your membership request is pending review by a group organizer.').'</div>');
     return $element;
   }
   // If user is blocked, they should not be able to apply for membership.
@@ -1128,7 +1128,7 @@ 
 
     $url = "group/$entity_type/$id/subscribe";
     if ($settings['field_name']) {
-      $url .= '/' . $settings['field_name'];
+      $url .= '/'.$settings['field_name'];
     }
     // Set the needs update hook if we end up with a group call that is missing
     // the subscribe settings. We also check the variable first, because we
@@ -1154,7 +1154,7 @@ 
           }
         }
         else {
-          $element[0] = array('#markup' => '<div class="subscription-type">' . t('Invite-only group') . '</div>');
+          $element[0] = array('#markup' => '<div class="subscription-type">'.t('Invite-only group').'</div>');
           return $element;
         }
       }
@@ -1170,7 +1170,7 @@ 
     );
 
     if (!empty($subscription_type)) {
-      $element[0]['#prefix'] = '<div class="subscription-type">' . $subscription_type . '</div>';
+      $element[0]['#prefix'] = '<div class="subscription-type">'.$subscription_type.'</div>';
     }
 
     return $element;

modules/commons/commons_activity_streams/commons_activity_streams.module

Indentation +4 added lines, -4 removed lines

@@ -130,10 +130,10 @@
 function commons_activity_streams_existing_messages($acting_uid, $target_ids, $target_field, $message_type) {
   $query = new EntityFieldQuery();
   $query->entityCondition('entity_type', 'message', '=')
-   ->propertyCondition('uid', $acting_uid)
-   ->propertyCondition('type', $message_type, '=')
-   ->fieldCondition($target_field, 'target_id', $target_ids, 'IN')
-   ->execute();
+    ->propertyCondition('uid', $acting_uid)
+    ->propertyCondition('type', $message_type, '=')
+    ->fieldCondition($target_field, 'target_id', $target_ids, 'IN')
+    ->execute();
 
   if (!empty($query->ordered_results)) {
     $mids = array();

Spacing +4 added lines, -4 removed lines

@@ -137,7 +137,7 @@ 
 
   if (!empty($query->ordered_results)) {
     $mids = array();
-    foreach($query->ordered_results as $result) {
+    foreach ($query->ordered_results as $result) {
       $mids[] = $result->entity_id;
     }
     return $mids;
@@ -224,7 +224,7 @@ 
   // Create a token to retrieve the user picture formatted using any of the
   // currently defined image styles.
   foreach ($styles as $style_name => $style) {
-    $tokens['picture:' . $style_name] = array(
+    $tokens['picture:'.$style_name] = array(
       'name' => t('Picture: @st image style', array('@st' => $style_name)),
       'description' => t('Picture: @st image style', array('@st' => $style_name)),
     );
@@ -252,7 +252,7 @@ 
 
     foreach ($tokens as $token => $original) {
       if (strpos($token, 'picture:') !== FALSE) {
-        list( , $style) = explode(':', $token);
+        list(, $style) = explode(':', $token);
 
         // Prefer unique account pictures but fall back to the default user
         // picture if necessary.
@@ -275,7 +275,7 @@ 
           'html' => TRUE,
         );
 
-        $replacements[$original] = "<div class='user-picture'>" . l($image, $user_path['path'], $link_options) . "</div>";
+        $replacements[$original] = "<div class='user-picture'>".l($image, $user_path['path'], $link_options)."</div>";
       }
     }
   }

modules/commons/commons_follow/includes/views/commons_follow.views.inc

Indentation +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     'title' => t('User Follow'), // The item it appears as on the UI,
     'help' => t('Whether the user is following this content.'), // The help that appears on the UI,
     'real field' => 'nid',
-     // Information for displaying a title as a field
+      // Information for displaying a title as a field
     'filter' => array(
       'handler' => 'commons_follow_user_follow_filter',
       'label' => t('Following'),
@@ -40,7 +40,7 @@ 
     'title' => t('User Follow'), // The item it appears as on the UI,
     'help' => t('Whether the user is following items related to this message.'), // The help that appears on the UI,
     'real field' => 'mid',
-     // Information for displaying a title as a field
+      // Information for displaying a title as a field
     'filter' => array(
       'handler' => 'commons_follow_user_follow_filter_message',
       'label' => t('Following'),