acquia / commons

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

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

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

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
       $variables['link_text'] = $flag->get_label($action . '_short', $entity_id);
 
       return theme('commons_follow_otheruser_flag', $variables);
-    }
-    else {
+    } else {
       return parent::render($values);
     }
 

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