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

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

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

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

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

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

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

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

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