BOINC / boinc

html/user/sample_index.php

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $master_url, $project_id;
     panel(
         $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),

html/user/create_account.php

Braces +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
             // set to 1.
             if ($consent_flag==0) {
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
-            } else  {
+            } else {
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
             }
             if (!$rc) {

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

Braces +29 added lines, -58 removed lines

@@ -430,8 +430,7 @@ 
       $user_info .= '  <div class="picture">';
       if (is_array($user_image) AND $user_image['image']['filepath']) {
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-      }
-      elseif (is_string($user_image)) {
+      } elseif (is_string($user_image)) {
         $user_info .= '<img src="' . $user_image . '"/>';
       }
       $user_info .= '  </div>';
@@ -473,8 +472,7 @@ 
     // If a specific comment is being referenced, go back to it on cancel
     if ($comment_ref = $form['pid']['#value']) {
       $cancel_url = "goto/comment/{$comment_ref}";
-    }
-    else {
+    } else {
       $cancel_url = "node/{$form['nid']['#value']}";
     }
     
@@ -528,8 +526,7 @@ 
             '#weight' => 1000,
           );
         }
-      }
-      else {
+      } else {
         $form = NULL;
         $form['from'] = array(
           '#type'  => 'item',
@@ -626,8 +623,7 @@ 
           'title' => bts('Reply to this topic with a quote', array(), NULL, 'boinc:forum-reply-to-comment')
       );
     }
-  }
-  else {
+  } else {
     // Standard EDIT, DELETE, and REPLY links are created by Drupal, but we want to alter them
     if (isset($links['comment_delete'])) {
       $links['comment_delete']['attributes'] = array(
@@ -681,8 +677,7 @@ 
                   'title' => bts('Remove sticky status from this topic', array(), NULL, 'boinc:forum-unsticky-comment')
               )
           );
-        }
-        else {
+        } else {
           $links['make_sticky'] = array(
               'title' => bts('Make sticky', array(), NULL, 'boinc:forum-sticky-comment'),
               'href' => "{$node_control}/sticky",
@@ -699,8 +694,7 @@ 
                   'title' => bts('Lock this thread for comments', array(), NULL, 'boinc:forum-lock-comment')
               )
           );
-        }
-        else {
+        } else {
           $links['unlock'] = array(
               'title' => bts('Unlock', array(), NULL, 'boinc:forum-unlock-comment'),
               'href' => "{$node_control}/unlock",
@@ -717,8 +711,7 @@ 
                   'title' => bts('Hide this topic', array(), NULL, 'boinc:forum-hide-comment')
               )
           );
-        }
-        else {
+        } else {
           $links['unhide'] = array(
               'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
               'href' => "{$node_control}/unhide",
@@ -729,8 +722,7 @@ 
         }
       }// if user_access('edit any forum topic')
     }
-  }
-  else if ($type=='comment') {
+  } else if ($type=='comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -771,8 +763,7 @@ 
                 'title' => bts('Hide this comment', array(), NULL, 'boinc:forum-hide-comment')
             )
         );
-      }
-      else {
+      } else {
         $links['unhide'] = array(
             'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
             'href' => "{$comment_control}/unhide",
@@ -958,8 +949,7 @@ 
       watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
         ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
-  }
-  elseif ($project_prefs) {
+  } elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
@@ -1002,8 +992,7 @@ 
         node_save($content_profile);
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -112,
@@ -1138,8 +1127,7 @@ 
           node_save($node);
           // Save the team IDs to a BOINC <--> Drupal reference table.
           db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam_id, $node->nid);
-        }
-        else {
+        } else {
           $xml['create_team_reply']['warning'] = t(
             'There was a problem integrating this team into Drupal. Please
             contact @project administrators!', array('@project' => PROJECT)
@@ -1154,8 +1142,7 @@ 
           // Delete from the BOINC DB if we can't sync with Drupal
           $boincteam::delete();
         }
-      }
-      else {
+      } else {
         $xml['create_team_reply']['warning'] = t(
           'There was a problem integrating this team into Drupal. Please
           contact @project administrators!', array('@project' => PROJECT)
@@ -1169,8 +1156,7 @@ 
         );
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -1,
@@ -1239,8 +1225,7 @@ 
         );
         $xml['users']['user'][] = $team_member;
       }
-    }
-    else {
+    } else {
       // Query BOINC database user table
       db_set_active('boinc_rw');
       $result = db_query("
@@ -1293,8 +1278,7 @@ 
         $xml['users']['user'][] = $team_members[$member->boinc_id];
       }
     } // end if credit_only
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1343,24 +1327,19 @@ 
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
-                }
-                else {
+                } else {
                   $error = 'Error saving avatar to profile';
                 }
-              }
-              else {
+              } else {
                 $error = 'Unable to load user profile';
               }
-            }
-            else {
+            } else {
               $error = 'User has no profile, so avatar could not be added';
             }
-          }
-          else {
+          } else {
             $error = 'Unable to save remote image';
           }
-        }
-        else {
+        } else {
           $error = 'Could not find avatar image at URL';
         }
       }
@@ -1387,8 +1366,7 @@ 
             'success' => NULL,
           ),
         );
-      }
-      else {
+      } else {
         // Failure
         $xml = array(
           'error' => array(
@@ -1397,8 +1375,7 @@ 
           ),
         );
       }
-    }
-    else {
+    } else {
       // Drupal user not found
       $xml = array(
         'error' => array(
@@ -1407,8 +1384,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     // BOINC user not found
     $xml = array(
       'error' => array(
@@ -1526,8 +1502,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1651,8 +1626,7 @@ 
         // Get the number of comments per page
         if ($user->comments_per_page) {
           $comments_per_page = $user->comments_per_page;
-        }
-        else {
+        } else {
           $node = node_load($object->nid);
           $comments_per_page = variable_get(
             "comment_default_per_page_{$node->type}", 50
@@ -1673,8 +1647,7 @@ 
     // Check for a login, then redirect to the user's friend requests page
     if ($user->uid) {
       drupal_goto("account/{$user->uid}/friends/pending");
-    }
-    else {
+    } else {
       drupal_goto('user/login', array(
         'destination' => 'goto/friend-requests'
       ));
@@ -1950,8 +1923,7 @@ 
     if ($moderator_rid !== FALSE) {
       $settings['recipients'] = array($moderator_rid);
       rules_action_mail_to_users_of_role($settings);
-    }
-    else {
+    } else {
       watchdog(
         'boinccore',
         'Unable to identify members of the moderator role to send moderator notifications!',
@@ -1982,8 +1954,7 @@ 
   }
   if (empty($args)) {
     return $string;
-  }
-  else {
+  } else {
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {

drupal/sites/default/boinc/modules/boincuser/boincuser_quote/boincuser_quote.module

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
           }
-        }
-        elseif ($nid && _quote_variable_get('node_link_display')) {
+        } elseif ($nid && _quote_variable_get('node_link_display')) {
           $node = node_load(array('nid' => $nid));
           if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);

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

Braces +15 added lines, -25 removed lines

@@ -418,11 +418,9 @@ 
 
         if ($edit['boincuser_name']) {
           $myname = $edit['boincuser_name'];
-        }
-        else if ($edit['name']) {
+        } else if ($edit['name']) {
           $myname = $edit['name'];
-        }
-        else {
+        } else {
           $myname = 'noname';
         }
 
@@ -434,8 +432,7 @@ 
         // If the 'pass' variable is already a hash, then don't hash it again.
         if ($edit['boinchash_flag']) {
           $user_params['passwd_hash'] = $edit['pass'];
-        }
-        else {
+        } else {
           // The passwd_hash here is only the md5() hash. This is
           // because BOINC make_user(), called later, will run
           // password_hash() on this md5 hash.
@@ -506,8 +503,7 @@ 
               $prev_email = $account->mail;
               $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
-            }
-            else {
+            } else {
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
             }
 
@@ -750,8 +746,7 @@ 
       case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
           $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
-        }
-        elseif ($action == 'unflag') {
+        } elseif ($action == 'unflag') {
           unset($form['actions']);
           $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
         }
@@ -1527,8 +1522,7 @@ 
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
         ), NULL, 'boinc:join-page') . '</li>';
-    }
-    else {
+    } else {
       $output .= '<li>' . bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
@@ -1563,8 +1557,7 @@ 
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
       ), NULL, 'boinc:join-page') . '</li>';
-    }
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
+    } else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
       $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
       ), NULL, 'boinc:join-page') . '</li>';
@@ -1606,8 +1599,7 @@ 
   ));
   if ($current_uotd->uotd_time < strtotime('today midnight')) {
     $uotd = boincuser_select_user_of_the_day();
-  }
-  else {
+  } else {
     $uotd = user_load($current_uotd->uid);
   }
   $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
@@ -1618,8 +1610,7 @@ 
   $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
   if ($user->uid) {
     $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  else {
+  } else {
     $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   $output .= '</div>';
@@ -1704,12 +1695,10 @@ 
     if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
     password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
       $output = array('authenticator' => $boinc_user->authenticator);
-    }
-    else {
+    } else {
       xml_error(-137);
     }
-  }
-  else {
+  } else {
     // Verify that there isn't somehow a Drupal user already (not possible with proper function)
     if ($existing_user = user_load(array('mail' => $params['email_addr']))) {
       xml_error(-137, 'account error');
@@ -2193,7 +2182,9 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+  foreach ($get as $arg => $value) {
+      $args[] = "{$arg}=" . rawurlencode($value);
+  }
   $query = '?' . implode('&', $args);
   
   // Load XML from RPC
@@ -2324,8 +2315,7 @@ 
       if ($node->uid == 0 || strlen($node->name) == 0) {
         // @see user_validate_name(). !'0' === TRUE.
         $document->ss_name = '0';
-      }
-      else {
+      } else {
         $document->ss_name = $account->boincuser_name;
         // We want the name to be searchable for keywords.
         $document->tos_name = $account->boincuser_name;

html/ops/team_import.php

Braces +4 added lines, -8 removed lines

@@ -64,8 +64,7 @@ 
             $t->user_postal_code = decode($t->user_postal_code);
             $t->user_url = decode($t->user_url);
             return $t;
-        }
-        else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
+        } else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
         else if (strstr($s, '<url>')) $t->url = parse_element($s, '<url>');
         else if (strstr($s, '<type>')) $t->type = parse_element($s, '<type>');
         else if (strstr($s, '<name_html>')) $t->name_html = parse_element($s, '<name_html>');
@@ -74,14 +73,12 @@ 
                 if (strstr($s, '</description>')) break;
                 $t->description .= $s;
             }
-        }
-        else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
+        } else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
         else if (strstr($s, '<id>')) $t->id = parse_element($s, '<id>');
         else if (strstr($s, '<user_email_munged>')) {
             $user_email_munged = parse_element($s, '<user_email_munged>');
             $t->user_email = str_rot13($user_email_munged);
-        }
-        else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
+        } else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
         else if (strstr($s, '<user_country>')) $t->user_country = parse_element($s, '<user_country>');
         else if (strstr($s, '<user_postal_code>')) $t->user_postal_code = parse_element($s, '<user_postal_code>');
         else if (strstr($s, '<user_url>')) $t->user_url = parse_element($s, '<user_url>');
@@ -140,8 +137,7 @@ 
         list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
         if ($checkct) {
             echo "   cannot make user when an consent to terms of use is required\n";
-        }
-        else {
+        } else {
             echo "   making user $t->user_email\n";
             $user = make_user($t->user_email, $t->user_name, random_string());
             if (!$user) {

html/ops/manage_consent_types.php

Braces +7 added lines, -14 removed lines

@@ -46,8 +46,7 @@ 
     if ($toggle == "Click to Enable") {
         $state = 1;
         $action = "Enabled";
-    }
-    else {
+    } else {
         $state = 0;
         $action = "Disabled";
     }
@@ -91,12 +90,10 @@ 
         if (!in_rops()) {
             if (!($ct->enabled)) {
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Enable\"></td>";
-            }
-            else {
+            } else {
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Disable\"></td>";
             }
-        }
-        else {
+        } else {
             echo "  <td>$ct->enabled</td>";
         }
 
@@ -107,12 +104,10 @@ 
         if (!in_rops()) {
             if (!($ct->privacypref)) {
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Enable\"></td>";
-            }
-            else {
+            } else {
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Disable\"></td>";
             }
-        }
-        else {
+        } else {
             echo "  <td>$ct->privacypref</td>";
         }
 
@@ -156,11 +151,9 @@ 
 
 if (post_str("add_consenttype", true)) {
     add_consenttype();
-}
-else if (post_str("toggleenabled", true)) {
+} else if (post_str("toggleenabled", true)) {
     mct_toggle_field("enabled");
-}
-else if (post_str("toggleprivacypref", true)) {
+} else if (post_str("toggleprivacypref", true)) {
     mct_toggle_field("privacypref");
 }
 

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

Braces +17 added lines, -34 removed lines

@@ -127,8 +127,7 @@ 
         if (isset($prefs[$name]['@value'])) {
           $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+      } else {
         $default[$name] = $prefs[$name];
       }
     }
@@ -655,8 +654,7 @@ 
   // Save the preset selection (or lack thereof)
   if (!$preset OR $preset == 'custom') {
     $prefs['preset'] = 'custom';
-  }
-  else {
+  } else {
     $prefs['preset'] = $preset;
   }
   
@@ -671,8 +669,7 @@ 
   if (!$result) {
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+  } elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that) {
     drupal_set_message(t('Your preferences have been updated.
@@ -927,8 +924,7 @@ 
     if (boincwork_host_merge($old_host, $current_host, $message)) {
       $merged[$old_host->id] = $old_host->id;
       $current_host = boincwork_host_get_info($current_host_id);
-    }
-    else {
+    } else {
       $errors[$old_host->id] = $message;
     }
   }
@@ -944,8 +940,7 @@ 
         $oxford_comma = '';
       }
       $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
-    }
-    else {
+    } else {
       $list = $last;
     }
     if (count($merged) == 1) {
@@ -956,8 +951,7 @@ 
           '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
-    }
-    else {
+    } else {
       drupal_set_message(bts(
         'Computers @old_ids have been merged successfully into @id.',
         array(
@@ -1023,11 +1017,9 @@ 
     if ($account->boincuser_default_pref_set == $venue) {
       $venue_is_default = TRUE;
     }
-  }
-  elseif (!$venue OR $venue == 'generic') {
+  } elseif (!$venue OR $venue == 'generic') {
     $venue_is_default = TRUE;
-  }
-  else {
+  } else {
     $venue_is_default = FALSE;
   }
   
@@ -1047,8 +1039,7 @@ 
         if (isset($prefs[$name]['@value'])) {
           $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+      } else {
         $default[$name] = $prefs[$name];
       }
     }
@@ -1232,16 +1223,13 @@ 
       foreach ($element as $ordered_element) {
         if (isset($ordered_element['@position'])) {
           $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
-        }
-        else {
+        } else {
           $unordered_array[] = array($type => $ordered_element);
         }
       }
-    }
-    elseif (isset($element['@position'])) {
+    } elseif (isset($element['@position'])) {
       $ordered_array[$element['@position']] = array($type => $element);
-    }
-    else {
+    } else {
       $unordered_array[] = array($type => $element);
     }
   }
@@ -1356,8 +1344,7 @@ 
   // Update the user's default preference set
   if ($edit['default_set']['default_venue']) {
     boincwork_set_default_venue($venue);
-  }
-  elseif ($venue == $account->boincuser_default_pref_set) {
+  } elseif ($venue == $account->boincuser_default_pref_set) {
     // User has cleared out the default venue setting
     boincwork_set_default_venue();
   }
@@ -1365,8 +1352,7 @@ 
   if (!$result) {
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+  } elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that)
     drupal_set_message(t('Your preferences have been updated.
@@ -1519,8 +1505,7 @@ 
   // Upload an avatar (pulled from profile_node_form):
   if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
-  }
-  else {
+  } else {
     $form['field_image'] = array(
       '#value' => '<div class="form-item">'
         . '<label class="placeholder">'
@@ -1690,8 +1675,7 @@ 
       global $base_url;
       if ($edit['language'] != language_default('language')) {
         $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
-      }
-      else {
+      } else {
         $form_state['redirect'] = $base_url . '/' . $_GET['q'];
       }
     }
@@ -1882,8 +1866,7 @@ 
       $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
       $rows[] = $row;
     }
-  }
-  else {
+  } else {
     $rows[] = array(
       array(
         'data' => bts('You have not added any users to your Ignore List.', array(), NULL, 'boinc:ignore-user-list'),

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