BOINC / boinc

drupal/sites/default/boinc/modules/node_comment_block/node_comment_block.module

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
   if (is_array($element)) {
     show($element);
     return drupal_render($element);
-  }
-  else {
+  } else {
     // Safe-guard for inappropriate use of render() on flat variables: return
     // the variable as-is.
     return $element;

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.module

Switch Indentation +13 added lines, -13 removed lines

@@ -280,12 +280,12 @@ 
   }
 
   switch ($op) {
-    case 'delete':
-      // Only call delete function on certain node types
-      if (in_array( $node->type, $node_types)) {
-        boinc_solr_comments_delete($node);
-      }
-      break;
+  case 'delete':
+    // Only call delete function on certain node types
+    if (in_array( $node->type, $node_types)) {
+      boinc_solr_comments_delete($node);
+    }
+    break;
   } //switch
 }
 
@@ -335,13 +335,13 @@ 
  */
 function boinc_solr_comments_comment(&$a1, $op) {
   switch ($op) {
-    case 'view':
-    case 'update':
-      break;
-    case 'delete':
-      // $a1 should be a comment object
-      boinc_solr_comments_deletecomment($a1);
-      break;
+  case 'view':
+  case 'update':
+    break;
+  case 'delete':
+    // $a1 should be a comment object
+    boinc_solr_comments_deletecomment($a1);
+    break;
   }// switch
 }
 

Braces +3 added lines, -6 removed lines

@@ -131,8 +131,7 @@ 
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
           // @see user_validate_name(). !'0' === TRUE.
           $comment_document->ss_name = '0';
-        }
-        else {
+        } else {
           $comment_document->ss_name = $comment->name;
           // We want the name to be searchable for keywords.
           $comment_document->tos_name = $comment->name;
@@ -318,8 +317,7 @@ 
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-  }
-  catch (Exception $e) {
+  } catch (Exception $e) {
       watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
       return FALSE;
   }// try
@@ -376,8 +374,7 @@ 
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-    }
-  catch (Exception $e) {
+    } catch (Exception $e) {
     watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
     return FALSE;
   }// try

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.admin.inc

Switch Indentation +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@
   foreach (content_types() as $key => $info) {
     // Exclude node types profile, team, and panel
     switch ($key) {
-      case 'profile':
-      case 'team':
-      case 'panel':
-        continue 2;
+    case 'profile':
+    case 'team':
+    case 'panel':
+      continue 2;
     }// switch key
     $options[$key] = $info['name'];
   }

drupal/sites/default/boinc/modules/boincwork/boincwork.module

Switch Indentation +6 added lines, -6 removed lines

@@ -180,12 +180,12 @@
  */
 function boincwork_locale($op = 'groups', $group = NULL) {
   switch ($op) {
-    case 'groups':
-      return array('project' => bts('Project'));
-    case 'info':
-      $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
-      return $info;
+  case 'groups':
+    return array('project' => bts('Project'));
+  case 'info':
+    $info['project']['refresh callback'] = 'boincwork_locale_refresh';
+    $info['project']['format'] = FALSE;
+    return $info;
   }
 }
 

Braces +9 added lines, -18 removed lines

@@ -280,8 +280,7 @@ 
         'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
       );
-    }
-    else {
+    } else {
       $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
@@ -400,8 +399,7 @@ 
             }
             if (!$special) {
               $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-            }
-            else {
+            } else {
               // The "very special" case where we merge two prefs
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
@@ -409,8 +407,7 @@ 
               $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+          } else {
             $output .= '<td>---</td>';
           }
         }
@@ -936,22 +933,19 @@ 
         drupal_set_message(t('Host @id has been removed from your account.',
           array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+      } else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
           array('@id' => $host_id)), 'error'
         );
       }
-    }
-    else {
+    } else {
       drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.',
         array('@id' => $host_id)), 'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.',
       array('@id' => $host_id)), 'error'
@@ -999,15 +993,13 @@ 
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
       );
-    }
-    else {
+    } else {
       drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
       'warning'
@@ -1164,8 +1156,7 @@ 
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);
     }
-  }
-  else {
+  } else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;

drupal/sites/default/boinc/modules/boinctranslate/boinctranslate.admin.inc

Braces +4 added lines, -8 removed lines

@@ -220,8 +220,7 @@ 
   if (!$values['boinc_translate_transifex_pass']) {
     if (!variable_get('boinc_translate_transifex_pass', '')) {
       form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
-    }
-    else {
+    } else {
       unset($form_state['values']['boinc_translate_transifex_pass']);
     }
   }
@@ -260,8 +259,7 @@ 
           'boinc_translate_transifex_pass',
           t('Transifex authentication failed.')
         );
-      }
-      else {
+      } else {
         $authenticated = TRUE;
       }
     }
@@ -278,14 +276,12 @@ 
       );
       if ($project_name AND $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
-      }
-      elseif ($project_name AND !$project_resources) {
+      } elseif ($project_name AND !$project_resources) {
         drupal_set_message(
           t('No project-specific resources were provided'),
           'warning'
         );
-      }
-      elseif ($project_resources AND !$project_name) {
+      } elseif ($project_resources AND !$project_name) {
         drupal_set_message(
           t('No project-specific Transifex project name was provided'),
           'warning'

drupal/sites/default/boinc/modules/boincuser/boincuser.admin.inc

Braces +3 added lines, -6 removed lines

@@ -157,13 +157,11 @@ 
   if (!$values['boinc_root_dir']) {
     form_set_error('boinc_root_dir', t('BOINC project root directory must be
       defined!'));
-  }
-  elseif (!is_dir($values['boinc_root_dir'])) {
+  } elseif (!is_dir($values['boinc_root_dir'])) {
     form_set_error('boinc_root_dir', t('BOINC project root not found at %directory',
       array('%directory' => $values['boinc_root_dir'])
     ));
-  }
-  else {
+  } else {
     // By default, try to automatically set specific directories from the root
     if (!$values['boinc_config_xml_dir']) {
       $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
@@ -285,8 +283,7 @@ 
   if (!$values['boinc_scheduler_urls']) {
     form_set_error('boinc_scheduler_urls', t('At least one scheduling server
       URL must be specified.'));
-  }
-  else {
+  } else {
     $urls = explode("\r\n", $values['boinc_scheduler_urls']);
     foreach ($urls as $key => $url) {
       if (!$url) {

Switch Indentation +36 added lines, -36 removed lines

@@ -32,42 +32,42 @@
   * existing BOINC web interface.
   */
 function boincuser_admin_environment(&$form_state) {
-  global $base_url;
-  $form = array();
-  $default = array(
-    'boinc_root_dir' => variable_get('boinc_root_dir', ''),
-    'boinc_config_xml_dir' => variable_get('boinc_config_xml_dir', ''),
-    'boinc_html_inc_dir' => variable_get('boinc_html_inc_dir', ''),
-    'boinc_project_config_dir' => variable_get('boinc_project_config_dir', ''),
-    'boinc_user_image_dir' => variable_get('boinc_user_image_dir', ''),
-    'boinc_host_sched_logs_dir' => variable_get('boinc_host_sched_logs_dir', ''),
-    'boinc_server_status_url' => variable_get('boinc_server_status_url', ''),
-    'boinc_app_list_url' => variable_get('boinc_app_list_url', ''),
-    'boinc_admin_mailing_list' => variable_get('boinc_admin_mailing_list', ''),
-    'boinc_admin_mailing_list_subject_tag' => variable_get('boinc_admin_mailing_list_subject_tag', ''),
-    'boinc_debug_mode' => variable_get('boinc_debug_mode', 0),
-    'boinc_project_config_keywords' => variable_get('boinc_project_config_keywords', ''),
-  );
-  //drupal_set_message(print_r($default, true));
-  //drupal_set_message(print_r($form_state, true));
-  // Show overrides if the root dir is set and others have not been detected
-  $show_overrides = FALSE;
-  if ($default['boinc_root_dir']) {
-    foreach ($default as $key => $dir) {
-      switch ($key) {
-      case 'boinc_config_xml_dir':
-      case 'boinc_html_inc_dir':
-      case 'boinc_project_config_dir':
-      case 'boinc_user_image_dir':
-        // If any of these values are not set, show the overrides section
-        if (!$dir) {
-          $default[$key] = $form_state['values'][$key];
-          $show_overrides = TRUE;
-          break;
-        }
-        break;
-      default:
-      }
+global $base_url;
+$form = array();
+$default = array(
+'boinc_root_dir' => variable_get('boinc_root_dir', ''),
+'boinc_config_xml_dir' => variable_get('boinc_config_xml_dir', ''),
+'boinc_html_inc_dir' => variable_get('boinc_html_inc_dir', ''),
+'boinc_project_config_dir' => variable_get('boinc_project_config_dir', ''),
+'boinc_user_image_dir' => variable_get('boinc_user_image_dir', ''),
+'boinc_host_sched_logs_dir' => variable_get('boinc_host_sched_logs_dir', ''),
+'boinc_server_status_url' => variable_get('boinc_server_status_url', ''),
+'boinc_app_list_url' => variable_get('boinc_app_list_url', ''),
+'boinc_admin_mailing_list' => variable_get('boinc_admin_mailing_list', ''),
+'boinc_admin_mailing_list_subject_tag' => variable_get('boinc_admin_mailing_list_subject_tag', ''),
+'boinc_debug_mode' => variable_get('boinc_debug_mode', 0),
+'boinc_project_config_keywords' => variable_get('boinc_project_config_keywords', ''),
+);
+//drupal_set_message(print_r($default, true));
+//drupal_set_message(print_r($form_state, true));
+// Show overrides if the root dir is set and others have not been detected
+$show_overrides = FALSE;
+if ($default['boinc_root_dir']) {
+foreach ($default as $key => $dir) {
+  switch ($key) {
+  case 'boinc_config_xml_dir':
+  case 'boinc_html_inc_dir':
+  case 'boinc_project_config_dir':
+  case 'boinc_user_image_dir':
+  // If any of these values are not set, show the overrides section
+  if (!$dir) {
+  $default[$key] = $form_state['values'][$key];
+  $show_overrides = TRUE;
+  break;
+  }
+  break;
+  default:
+  }
       if ($show_overrides) {
         break;
       }

drupal/sites/all/features/global_search_solr/global_search_solr.features.inc

Braces +2 added lines, -4 removed lines

@@ -7,11 +7,9 @@
   list($module, $api) = func_get_args();
   if ($module == "apachesolr" && $api == "apachesolr_environments") {
     return array("version" => 1);
-  }
-  elseif ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
+  } elseif ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
     return array("version" => 3);
-  }
-  elseif ($module == "facetapi" && $api == "facetapi_defaults") {
+  } elseif ($module == "facetapi" && $api == "facetapi_defaults") {
     return array("version" => 1);
   }
 }

drupal/sites/all/features/news/news.features.inc

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
   list($module, $api) = func_get_args();
   if ($module == "context" && $api == "context") {
     return array("version" => 3);
-  }
-  elseif ($module == "strongarm" && $api == "strongarm") {
+  } elseif ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
   }
 }

drupal/sites/all/features/discussion_forums/discussion_forums.module

Braces +2 added lines, -4 removed lines

@@ -26,8 +26,7 @@ 
   
   if (isset($roles[$rid]) AND $roles[$rid] == $better_name) {
     // Life is good
-  }
-  else {
+  } else {
     $better_rid = array_search($better_name, $roles);
     $old_rid = array_search('Forum Moderator', $roles);
     if (!$better_rid) {
@@ -36,8 +35,7 @@ 
           $better_name, $old_rid);
         $better_rid = $old_rid;
         $old_rid = NULL;
-      }
-      else {
+      } else {
         drupal_set_message(t('The Forum Access module is not set up right. Try disabling the Discussion Forums feature and then manually uninstall the Forum Access module before enabling Discussion Forums again.', 'error'));
       }
     }