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

@@ -279,8 +279,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,
@@ -387,8 +386,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];
@@ -396,8 +394,7 @@ 
               $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+          } else {
             $output .= '<td>---</td>';
           }
         }
@@ -923,22 +920,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'
@@ -986,15 +980,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'
@@ -1129,8 +1121,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/boincimport/boincimport.module

Switch Indentation +109 added lines, -109 removed lines

@@ -300,125 +300,125 @@
   }
   
   switch ($form_state['values']['import']) {
-    case 'users':
-      boincimport_users();
-      break;
-
-    case 'teams':
-      boincimport_teams();
-      if (!variable_get('boincimport_import_team_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      break;
+  case 'users':
+    boincimport_users();
+    break;
 
-    case 'friends':
-      boincimport_friends();
-      if (!variable_get('boincimport_import_friend_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      break;
+  case 'teams':
+    boincimport_teams();
+    if (!variable_get('boincimport_import_team_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'teams';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    break;
 
-    case 'preferences':
-      boincimport_preferences();
-      if (!variable_get('boincimport_import_preferences_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      break;
+  case 'friends':
+    boincimport_friends();
+    if (!variable_get('boincimport_import_friend_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    break;
 
-    case 'private messages':
-      boincimport_private_msgs();
-      if (!variable_get('boincimport_import_private_msg_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      break;
+  case 'preferences':
+    boincimport_preferences();
+    if (!variable_get('boincimport_import_preferences_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    break;
 
-    case 'categories':
-      boincimport_forum_categories();
-      if (!variable_get('boincimport_import_category_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      break;
+  case 'private messages':
+    boincimport_private_msgs();
+    if (!variable_get('boincimport_import_private_msg_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    break;
 
-    case 'topics':      
-      boincimport_forum_topics();
-      if (!variable_get('boincimport_import_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      break;
+  case 'categories':
+    boincimport_forum_categories();
+    if (!variable_get('boincimport_import_category_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    break;
+
+  case 'topics':      
+    boincimport_forum_topics();
+    if (!variable_get('boincimport_import_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    break;
       
-    case 'posts':
-      boincimport_forum_posts();
-      if (!variable_get('boincimport_import_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'posts':
+    boincimport_forum_posts();
+    if (!variable_get('boincimport_import_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
 
-    case 'team forums':
-      boincimport_team_forums();
-      if (!variable_get('boincimport_team_forum_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      break;
+  case 'team forums':
+    boincimport_team_forums();
+    if (!variable_get('boincimport_team_forum_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team forums';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    break;
 
-    case 'team topics':      
-      boincimport_team_forum_topics();
-      if (!variable_get('boincimport_team_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      break;
+  case 'team topics':      
+    boincimport_team_forum_topics();
+    if (!variable_get('boincimport_team_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    break;
       
-    case 'team posts':
-      boincimport_team_forum_posts();
-      if (!variable_get('boincimport_team_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'team posts':
+    boincimport_team_forum_posts();
+    if (!variable_get('boincimport_team_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
 
-    case 'url':
-      boincimport_replace_urls();
-      if (!variable_get('boincimport_replace_url_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
-        drupal_set_message('Congratulations.  Import Finished');
-        drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
-        watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
-        unset($_SESSION['boincimport_stage_selected']);
-      }
-      break;
-    default:
-      $_SESSION['boincimport_stage_selected'] = 'users';
-      break;
+  case 'url':
+    boincimport_replace_urls();
+    if (!variable_get('boincimport_replace_url_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    else {
+      drupal_set_message('Congratulations.  Import Finished');
+      drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
+      watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
+      unset($_SESSION['boincimport_stage_selected']);
+    }
+    break;
+  default:
+    $_SESSION['boincimport_stage_selected'] = 'users';
+    break;
   }
 }
 

Braces +91 added lines, -180 removed lines

@@ -172,8 +172,7 @@ 
   $out['result'] = $result;
   if ($result == 1) {
     $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
-  }
-  else {
+  } else {
     $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
   }
   $out['html'] .= '</ul>';
@@ -201,16 +200,14 @@ 
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
       $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
-    }
-    else {
+    } else {
       // adapt from db_table_exists in database.mysql.inc
       $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
       $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
-    }
-    else {
+    } else {
       $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
       $out['result']= 0;
     }
@@ -252,8 +249,7 @@ 
       array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
       ), WATCHDOG_WARNING); 
-  }
-  else {
+  } else {
     $boincimport_functions = array(
       'users' => t('Import users'),
       'teams' => t('Import teams'),
@@ -288,8 +284,7 @@ 
   // Lock the import process
   if (!variable_get('boincimport_process_locked', 0)) {
     variable_set('boincimport_process_locked', 1);
-  }
-  else {
+  } else {
     watchdog('boincimport', 'The import process is locked, but another process
       is trying to access it...', array(), WATCHDOG_WARNING); 
   }
@@ -303,8 +298,7 @@ 
       boincimport_teams();
       if (!variable_get('boincimport_import_team_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'friends';
       }
       break;
@@ -313,8 +307,7 @@ 
       boincimport_friends();
       if (!variable_get('boincimport_import_friend_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
       }
       break;
@@ -323,8 +316,7 @@ 
       boincimport_preferences();
       if (!variable_get('boincimport_import_preferences_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
       }
       break;
@@ -333,8 +325,7 @@ 
       boincimport_private_msgs();
       if (!variable_get('boincimport_import_private_msg_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'categories';
       }
       break;
@@ -343,8 +334,7 @@ 
       boincimport_forum_categories();
       if (!variable_get('boincimport_import_category_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'topics';
       }
       break;
@@ -353,8 +343,7 @@ 
       boincimport_forum_topics();
       if (!variable_get('boincimport_import_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'posts';
       }
       break;
@@ -363,8 +352,7 @@ 
       boincimport_forum_posts();
       if (!variable_get('boincimport_import_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -373,8 +361,7 @@ 
       boincimport_team_forums();
       if (!variable_get('boincimport_team_forum_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
       }
       break;
@@ -383,8 +370,7 @@ 
       boincimport_team_forum_topics();
       if (!variable_get('boincimport_team_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
       }
       break;
@@ -393,8 +379,7 @@ 
       boincimport_team_forum_posts();
       if (!variable_get('boincimport_team_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -403,8 +388,7 @@ 
       boincimport_replace_urls();
       if (!variable_get('boincimport_replace_url_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
+      } else {
         drupal_set_message('Congratulations.  Import Finished');
         drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
@@ -473,8 +457,7 @@ 
       ORDER BY id ASC'
     );
     $user_count = mysqli_num_rows($boinc_accounts);
-  }
-  else {
+  } else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array(0);
@@ -550,8 +533,7 @@ 
      if (isset($existing_users[$boinc_account->id])) {
       // This user has already been imported
       $duplicates[] = $boinc_account->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_users_op', array(
           $boinc_account->id
@@ -607,8 +589,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boinc_id;
     $message = "Successfully imported user {$boinc_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boinc_id;
     $message = "Failed to import user {$boinc_id}!";
     watchdog('boincimport',
@@ -625,8 +606,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -651,8 +631,7 @@ 
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -714,8 +693,7 @@ 
         $team_type = array(
           'tid' => $team_type_id
         );
-      }
-      else {
+      } else {
         if (!$name) continue;
         $team_type = array(
           'name' => strip_tags($name),
@@ -778,8 +756,7 @@ 
      if (isset($existing_teams[$boinc_team->id])) {
       // This team has already been imported
       $duplicates[] = $boinc_team->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_teams_op', array(
           $boinc_team
@@ -820,8 +797,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincteam->id;
     $message = "Successfully imported team {$boincteam->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincteam->id;
     $message = "Failed to import team {$boincteam->id}!";
     watchdog('boincimport',
@@ -838,8 +814,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -862,8 +837,7 @@ 
     // Set the team import successful flag in the variable table
     variable_set('boincimport_import_team_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'friends';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -984,8 +958,7 @@ 
       SET uid = '%d', friend_uid = '%d', created = '%d'",
       $uid, $friend_uid, $friendship->create_time
     );
-  }
-  else {
+  } else {
     $boinc_id = ($uid) ? $friendship->user_dest : $friendship->user_src;
     $message = "No Drupal account exists for BOINC user {$boinc_id}!";
   }
@@ -994,8 +967,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully made users {$uid} and {$friend_uid} friends";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     if (!$message) {
       $message = "Failed to make users {$uid} and {$friend_uid} friends!";
@@ -1011,8 +983,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1036,8 +1007,7 @@ 
     // Set the friend import successful flag in the variable table
     variable_set('boincimport_import_friend_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'preferences';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1161,8 +1131,7 @@ 
     );
     if ($user_ignored) {
       $success = TRUE;
-    }
-    else {
+    } else {
       $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
       watchdog('boincimport',
         'Could not add user @ignored_uid to the ignore list of user @uid',
@@ -1177,8 +1146,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully imported ignored users for user {$uid}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     $message = "Failed to import any user filter preferences for user {$uid}!";
     watchdog('boincimport',
@@ -1195,8 +1163,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1221,8 +1188,7 @@ 
     // Set the preference import successful flag in the variable table
     variable_set('boincimport_import_preferences_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'private messages';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1356,8 +1322,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $pm->id;
     $message = "Successfully imported private message {$pm->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $pm->id;
     $message = "Failed to import private message {$pm->id}!";
     watchdog('boincimport',
@@ -1374,8 +1339,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1398,8 +1362,7 @@ 
     // Set the private message import successful flag in the variable table
     variable_set('boincimport_import_private_msg_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'categories';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1552,8 +1515,7 @@ 
     if (in_array($boinc_forum_category->name, $existing_categories)) {
       // This category has already been imported
       $duplicate_categories[] = $boinc_forum_category->name;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forum_categories_op', array(
           $boinc_forum_category, $forum_vid, $pre, FALSE
@@ -1567,8 +1529,7 @@ 
      if (isset($existing_forums[$boinc_forum->id])) {
       // This forum has already been imported
       $duplicates[] = $boinc_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forums_op', array(
           $boinc_forum, $forum_vid, $pre
@@ -1635,8 +1596,7 @@ 
     $category->name = 'Hidden';
     $category->id = 0;
     $hidden = TRUE;
-  }
-  else {
+  } else {
     // If this container is empty, put it into the hidden container
     db_set_active('boinc_rw');
     $forums_contained = db_result(db_query('
@@ -1679,13 +1639,11 @@ 
     // Store some result for post-processing in the finished callback.
     if (!$category AND $create_hidden) {
       $message = "Created special hidden container";
-    }
-    else {
+    } else {
       $context['results']['categories']['success'][] = $category->id;
       $message = "Successfully imported container {$category->id}";
     }
-  }
-  else {
+  } else {
     $context['results']['categories']['failure'][] = $category->id;
     $message = "Failed to import container {$category->id}!";
     watchdog('boincimport',
@@ -1702,8 +1660,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1739,8 +1696,7 @@ 
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
     $success = TRUE;
-  }
-  else {
+  } else {
     // Save all other forums as taxonomy terms
     $forum = array(
       'name' => $name,
@@ -1766,8 +1722,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['forums']['success'][] = $forum_id;
     $message = "Successfully imported forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['forums']['failure'][] = $forum_id;
     $message = "Failed to import forum {$forum_id}!";
   }
@@ -1780,8 +1735,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1882,8 +1836,7 @@ 
     // Set the forum import successful flag in the variable table
     variable_set('boincimport_import_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2037,9 +1990,7 @@ 
     
     if ($duplicate OR !$post) {
       $success = FALSE;
-    }
-    
-    else {
+    } else {
       // Get the user and term IDs along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
       $tid = db_result(db_query('
@@ -2103,12 +2054,10 @@ 
           if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
           }
-        }
-        else {
+        } else {
           $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
         }
-      }
-      else {
+      } else {
         $error_detail = 'failed to save topic node to database';
       }
     }
@@ -2119,16 +2068,13 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $topic->id;
       $message = "Successfully imported topic {$topic->id}";
-    }
-    elseif ($duplicate) {
+    } elseif ($duplicate) {
       $context['results']['duplicate'][] = $topic->id;
       $message = "Topic {$topic->id} was already imported";
-    }
-    elseif (!$post) {
+    } elseif (!$post) {
       $context['results']['empty'][] = $topic->id;
       $message = "Skipping topic {$topic->id} as empty";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $topic->id;
       $message = "Failed to import topic {$topic->id}!";
       watchdog('boincimport',
@@ -2149,8 +2095,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -2184,8 +2129,7 @@ 
     // Set the topic import successful flag in the variable table
     variable_set('boincimport_import_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2433,18 +2377,15 @@ 
           if ($success) {
             $posts_imported++;
             $context['results']['posts']['success'][] = $post->id;
-          }
-          else {
+          } else {
             $context['results']['posts']['failure'][] = $post->id;
             $error_posts++;
           }
-        }
-        else {
+        } else {
           $context['results']['posts']['failure'][] = $post->id;
           $error_posts++;
         }
-      }
-      else {
+      } else {
         $context['results']['posts']['empty'][] = $post->id;
         $empty_posts++;
       }
@@ -2455,8 +2396,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $boinc_topic->id;
       $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $boinc_topic->id;
       $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
       watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)', 
@@ -2477,8 +2417,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -2518,8 +2457,7 @@ 
     // Set the post import successful flag in the variable table
     variable_set('boincimport_import_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team forums';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2606,8 +2544,7 @@ 
      if (isset($existing_team_forums[$boincteam_forum->id])) {
       // This team has already been imported
       $duplicates[] = $boincteam_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_forums_op', array(
           $boincteam_forum
@@ -2673,8 +2610,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $forum_id;
     $message = "Successfully imported team forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $forum_id;
     $message = "Failed to import team forum {$forum_id}!";
     watchdog('boincimport',
@@ -2691,8 +2627,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -2715,8 +2650,7 @@ 
     // Set the team forum import successful flag in the variable table
     variable_set('boincimport_import_team_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2811,8 +2745,7 @@ 
      if (isset($existing_team_topics[$boincteam_topic->id])) {
       // This team topic has already been imported
       $duplicates[] = $boincteam_topic->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_topics_op', array(
           $boincteam_topic
@@ -2859,8 +2792,7 @@ 
   ));
   if (!$team_forum_id) {
     $missing_parent[] = $topic->id;
-  }
-  else {
+  } else {
     // Get the content of the post that started the topic
     db_set_active('boinc_rw');
     $query = db_query('
@@ -2877,8 +2809,7 @@ 
       // Empty topics should have already been filtered out of the import, so
       // consider this an error condition
       $empty_topics[] = $topic->id;
-    }
-    else {
+    } else {
       // Get the user ID along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
        if (!$topic->owner) {
@@ -2942,8 +2873,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $topic->id;
     $message = "Successfully imported team topic {$topic->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $topic->id;
     $message = "Failed to import team topic {$topic->id}!";
     watchdog('boincimport',
@@ -2960,8 +2890,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -2984,8 +2913,7 @@ 
     // Set the BLAH import successful flag in the variable table
     variable_set('boincimport_import_team_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3107,8 +3035,7 @@ 
       if (isset($existing_posts[$boincteam_post->id])) {
         // This post has already been imported
         $duplicates[] = $boincteam_post->id;
-      }
-      else {
+      } else {
         $operations[] = array(
           'boincimport_team_posts_op', array(
             $boincteam_post
@@ -3224,8 +3151,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $post->id;
     $message = "Successfully imported team post {$post->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $post->id;
     $message = "Failed to import team post {$post->id}!";
     watchdog('boincimport',
@@ -3242,8 +3168,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -3266,8 +3191,7 @@ 
     // Set the team post import successful flag in the variable table
     variable_set('boincimport_import_team_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3373,8 +3297,7 @@ 
     $context['results']['success'][] = $boincuser_id;
     $context['results']['subscriptions'][$boincuser_id] = $count;
     $message = "Successfully imported {$count} subscriptions for user {$boincuser_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincuser_id;
     $message = "Failed to import subscriptions for user {$boincuser_id}!";
     watchdog('boincimport',
@@ -3391,8 +3314,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -3417,8 +3339,7 @@ 
     // Set the subscription import successful flag in the variable table
     variable_set('boincimport_import_subscription_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3596,8 +3517,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['nodes']['updated'][] = $node->nid;
       $message = "Successfully updated node {$node->nid}";
-    }
-    else {
+    } else {
       $message = "No changes made to node {$node->nid}!";
     }
     
@@ -3609,8 +3529,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3660,8 +3579,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['comments']['updated'][] = $comment->cid;
       $message = "Successfully updated comment {$comment->cid}";
-    }
-    else {
+    } else {
       $message = "No changes made to comment {$comment->cid}!";
     }
     
@@ -3673,8 +3591,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3723,8 +3640,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['pm']['updated'][] = $pm->mid;
       $message = "Successfully updated private message {$pm->mid}";
-    }
-    else {
+    } else {
       $message = "No changes made to private message {$pm->mid}!";
     }
     
@@ -3736,8 +3652,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3802,8 +3717,7 @@ 
     // Set the replace URLs successful flag in the variable table
     variable_set('boincimport_replace_urls_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'users';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3905,7 +3819,8 @@ 
   $score = 0; // 0 default value, comments get higher score depending on the author's roles
   $users = serialize(array(0 => 1));  // default value for everybody!!
   
-  if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
+  if ($edit['uid'] === $user->uid) {
+// '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
   }
 
@@ -4028,13 +3943,11 @@ 
       if (isset($this->boincDomains[$domain])) {
         // This is a URL configured to be transformed
         return "{$http}://{$this->drupalDomain}{$this->basePath}";
-      }
-      else {
+      } else {
         // This URL should not be transformed
         return NULL;
       }
-    }
-    else {
+    } else {
       // This is a relative URL
       return $this->basePath;
     }
@@ -4056,8 +3969,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }
@@ -4081,8 +3993,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }

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

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/boinc_standard/boinc_standard.features.inc

Braces +4 added lines, -8 removed lines

@@ -7,17 +7,13 @@
   list($module, $api) = func_get_args();
   if ($module == "input_formats" && $api == "input_formats") {
     return array("version" => 1);
-  }
-  elseif ($module == "page_manager" && $api == "pages_default") {
+  } elseif ($module == "page_manager" && $api == "pages_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "panels_mini" && $api == "panels_default") {
+  } elseif ($module == "panels_mini" && $api == "panels_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "strongarm" && $api == "strongarm") {
+  } elseif ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
-  }
-  elseif ($module == "wysiwyg" && $api == "wysiwyg") {
+  } elseif ($module == "wysiwyg" && $api == "wysiwyg") {
     return array("version" => 2);
   }
 }