BOINC / boinc

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

Braces +17 added lines, -34 removed lines

@@ -258,8 +258,7 @@ 
         ), WATCHDOG_NOTICE
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not allowed to assume foundership of this
       team.'
     ));
@@ -284,8 +283,7 @@ 
     drupal_set_message(t('@team has been removed.',
       array('@team' => $boincteam->name)));
     drupal_goto('community/teams');
-  }
-  else {
+  } else {
     drupal_set_message(t('All members must be removed from @team before the
       team can be deleted.', array('@team' => $boincteam->name)), 'error');
     drupal_goto(strstr($_GET['q'], '/delete', TRUE));
@@ -519,8 +517,7 @@ 
         array('@team' => $boincteam->name)));
       watchdog('boincteam', 'added user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-    }
-    else {
+    } else {
       // @todo - consider another rule/error event here
       drupal_set_message(t('There was a problem joining @team, please try again
         later', array('@team' => $boincteam->name)));
@@ -548,8 +545,7 @@ 
       array('@team' => $boincteam->name)));
     watchdog('boincteam', 'removed user @uid from team @nid',
       array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-  }
-  else {
+  } else {
       drupal_set_message(t('You are not a member of @team, so you cannot revoke
         your membership to it.', array('@team' => $boincteam->name)));
   }
@@ -618,8 +614,7 @@ 
         '@uid' => $account->uid, 
         '@nid' => $team_id
       ), WATCHDOG_NOTICE);
-  }
-  else {
+  } else {
       drupal_set_message(t('@user is not a member of @team, so you cannot
         revoke the membership.', array(
           '@user' => $account->boincuser_name,
@@ -648,14 +643,12 @@ 
         '@user' => $account->boincuser_name
       )
     ), 'warning');
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+  } elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // It hasn't been long enough since the last transfer request
     drupal_set_message(t('A foundership change was requested during the last 90
       days, so new requests are not allowed. Please try again later.'
     ), 'warning');
-  }
-  elseif (boincteam_is_member($team_id, $account->uid)) {
+  } elseif (boincteam_is_member($team_id, $account->uid)) {
     // Log the transfer request
     db_set_active('boinc_rw');
     db_query("
@@ -861,8 +854,7 @@ 
     $output .= '[';
     if ($credit_needed == 1) {
       $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
-    }
-    else {
+    } else {
       $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed),
 	NULL, 'boinc:create-team-panel'
@@ -915,8 +907,7 @@ 
     $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
     $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
     $output .= '</div>' . "\n";
-  }
-  else if ($user->uid == $account->uid) {
+  } else if ($user->uid == $account->uid) {
     $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
@@ -1123,8 +1114,7 @@ 
       if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
           . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('@count days have elapsed since your request and'
           . ' the founder has not responded.',
           array('@count' => $request_age),
@@ -1134,8 +1124,7 @@ 
       if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
           . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('You now have @count days to assume foundership before'
           . ' another team member may submit a request.',
           array('@count' => $days_to_respond),
@@ -1146,23 +1135,20 @@ 
       $output .= '  <li class="first last tab">' . 
         l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
       $output .= '</ul>';
-    }
-    else {
+    } else {
       $output .= '<p>';
       if ($days_to_deadline == 1) {
         $output .= bts('The team founder has 1 day to respond to your'
           . ' transfer request.',
           NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('The team founder has @count days to respond to your'
           . ' transfer request.', array('@count' => $days_to_deadline),
           NULL, 'boinc:team-request-foundership');
       }
       $output .= '</p>';
     }
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+  } elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // If this user does not have a transfer request pending, but new requests
     // are not allowed, set the deadline to 90 days instead of 60 (as the user
     // who made the request has 30 additional days to assume foundership if 
@@ -1175,15 +1161,13 @@ 
       NULL, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
       $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
-    }
-    else {
+    } else {
       $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline),
         NULL, 'boinc:team-request-foundership') . ')';
     }
     $output .= '</p>';
-  }
-  else {
+  } else {
     $output .= '<p>' . bts('If the team founder is not active and you want to'
       . ' assume the role of founder, click below to request foundership of'
       . ' @this_team.',
@@ -1229,8 +1213,7 @@ 
         $boincteam_id
       );
       db_set_active('default');
-    }
-    else {
+    } else {
       $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
       $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';

drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc

Braces +11 added lines, -22 removed lines

@@ -135,8 +135,7 @@ 
   
   if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+  } else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
       form_set_error('name', bts('A team named "@name" already exists.',
@@ -177,8 +176,7 @@ 
   if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
@@ -212,8 +210,7 @@ 
   if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
@@ -381,8 +378,7 @@ 
     $form['form control tabs'] = array(
       '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+  } else {
     $form['description'] = array(
       '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
       '#value' => $default['description'],
@@ -412,12 +408,10 @@ 
   
   if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+  } else {
     if (!$name) {
       form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-    }
-    else {
+    } else {
       $team = node_load($form_state['storage']['team_id']);
       if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
@@ -559,8 +553,7 @@ 
   
   if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+  } else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
@@ -570,24 +563,21 @@ 
           '@username' => $account->boincuser_name
         ),
       NULL, 'boinc:team-add-admin'));
-    }
-    elseif (boincteam_is_founder($team_id, $account->uid)) {
+    } elseif (boincteam_is_founder($team_id, $account->uid)) {
       form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
-    }
-    elseif (boincteam_is_admin($team_id, $account->uid)) {
+    } elseif (boincteam_is_admin($team_id, $account->uid)) {
       form_set_error('username', bts('@user is already an admin of @team.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
-    }
-    else {
+    } else {
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;
       $form_state['storage']['boincuser_name'] = $account->boincuser_name;
     }
@@ -645,8 +635,7 @@ 
   if (isset($form_state['values'])) {
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  else {
+  } else {
     $subject   = '';
     $body      = '';
   }

drupal/sites/default/boinc/modules/boincuser/includes/boincuser.helpers.inc

Braces +11 added lines, -22 removed lines

@@ -71,8 +71,7 @@ 
       unset($account->roles[$unrestricted_role]);
     }
     user_save($account, array('roles' => $account->roles));
-  }
-  else {
+  } else {
     if (!isset($account->roles[$community_role])) {
       // The user should be a 'community member' role. If the user was
       // previously banned, this will restore that role.
@@ -88,8 +87,7 @@ 
         $account->roles[$unrestricted_role] = 'verified contributor';
         user_save($account, array('roles' => $account->roles));
       }
-    }
-    else {
+    } else {
       drupal_set_message(bts(
         'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
         array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
@@ -175,12 +173,10 @@ 
       if ($never_been_picked) {
         // Allow users who have been previously selected
         $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
+      } elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
         $active_users = FALSE;
-      }
-      else {
+      } else {
         // Process failed...
         return FALSE;
       }
@@ -235,8 +231,7 @@ 
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
       . "on {$changedate}. If you need to reverse this change, please look for "
       . "an email send to the email address: {$prev_email}.\n";
-  }
-  else {
+  } else {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
       . "on {$changedate}. You will not be able to change your email address "
       . "until {$newdate}. If you need to reverse this change, please look for "
@@ -357,8 +352,7 @@ 
       rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
@@ -399,8 +393,7 @@ 
   // If boincid or token is not present, then go to the home page.
   if (empty($params['boincid']) or empty($params['token'])) {
     $redirect = '';
-  }
-  else {
+  } else {
     $uid = boincuser_lookup_uid($params['boincid']);
     $redirect = "/user/${uid}/recoveremail/${params['token']}";
   }
@@ -451,8 +444,7 @@ 
   $dir = "boinc_{$type}_dir";
   if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
     return $include_dir;
-  }
-  else {
+  } else {
     // Don't show errors on blacklisted pages
     $page_blacklist = array(
       'admin/boinc/environment'
@@ -465,8 +457,7 @@ 
         drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment'))), 'warning', FALSE);
-      }
-      else {
+      } else {
         drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
       }
@@ -481,8 +472,7 @@ 
       if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
       }
-    }
-    else {
+    } else {
       // Clear the messages on the environment config page
       drupal_get_messages();
     }
@@ -501,8 +491,7 @@ 
   );
   if ($url_config = variable_get('boinc_scheduler_urls', '')) {
     return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
+  } elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
           array('!verify' => l(t('verify the default values') . ' <strong>' . 

html/user/account_ownership.php

Braces +2 added lines, -1 removed lines

@@ -120,7 +120,8 @@
   // GET request - the user has navigated to the page.
   page_head(tra("Generate proof of account ownership"), null, null, null, boinc_recaptcha_get_head_extra());
 
-  if ($user) { // Verify the user is logged in
+  if ($user) {
+// Verify the user is logged in
       require_once("../inc/account_ownership.inc");
 
       if (!file_exists($account_ownership_private_key_file_path)) {

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

Braces +3 added lines, -6 removed lines

@@ -66,8 +66,7 @@ 
         $vars['action'] = 'none';
         $vars['link_text'] = t('Reset Completely');
         $vars['link_title'] = t('Reset everying, allows users to re-flag content.');
-      }
-      else {
+      } else {
         $vars['action'] = 'none';
         $vars['link_text'] = t('Locked');
         $vars['link_title'] = t('Reporting locked by moderator.');
@@ -75,8 +74,7 @@ 
         $vars['link_href'] = '';
         $vars['flag_classes'] = 'flag style-like-link';
       }
-    }
-    else {
+    } else {
       // If there are flags on this content, clear the flags and
       // lock the content.
       if (user_access('reset abuse flags', $myuser)) {
@@ -121,8 +119,7 @@ 
         drupal_set_message(bts('INFO: Reset everything. Users may reflag this content.', array(), NULL, 'boinc:flag-abuse-reset'), 'info');
         // unlock flag; effectively resets flags for this content
         variable_del($flag->name.'-'.$content_id);
-      }
-      else {
+      } else {
         // Clear and Lock all flags on this content.
         $dbresult = db_query("SELECT DISTINCT fid FROM {flag_content} WHERE content_id = %d", $content_id);
         $rows = 0;

html/inc/forum.inc

Braces +17 added lines, -17 removed lines

@@ -238,7 +238,7 @@ 
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -251,7 +251,7 @@ 
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
             $url, $curpage-1, $items_per_page,
             tra("Previous")." · "
@@ -268,7 +268,7 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
+    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++) {
         $page_str = (string)($i+1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
@@ -289,7 +289,7 @@ 
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages-1) {
         $x .= page_link(
             $url, $curpage+1, $items_per_page,
             " &middot; ".tra("Next")
@@ -518,7 +518,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -539,9 +539,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -578,7 +578,7 @@ 
     
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
@@ -599,7 +599,7 @@ 
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
@@ -615,7 +615,7 @@ 
         $user->nposts = BoincPost::count("user=$user->id");
     }
     
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -654,7 +654,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -674,7 +674,7 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
+    if ($ignore_poster && $filter) {
         echo "<br>" .tra(
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
@@ -688,7 +688,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -696,7 +696,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -755,7 +755,7 @@ 
     $content = output_transform($post->content, $options);
     $when = time_diff_str($post->timestamp, time());
     $user = BoincUser::lookup_id($post->user);
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -1089,7 +1089,7 @@ 
         
     $sql = 'forum = ' . $forumID ;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
@@ -1170,7 +1170,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban"); 
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
 

drupal/sites/all/features/boinc_standard/boinc_standard.features.inc

Braces +3 added lines, -6 removed lines

@@ -7,14 +7,11 @@
   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);
   }
 }