BOINC / boinc

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/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 "
@@ -353,8 +348,7 @@ 
       'error');
     }
     return $rc1;
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. Please contact site administrators.', array(), 'NULL', 'boinc:consent-termsofuse'),
     'error');
@@ -393,8 +387,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']}";
   }
@@ -445,8 +438,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'
@@ -459,8 +451,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);
       }
@@ -475,8 +466,7 @@ 
       if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
       }
-    }
-    else {
+    } else {
       // Clear the messages on the environment config page
       drupal_get_messages();
     }
@@ -495,8 +485,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/user_agreetermsofuse_action.php

Braces +2 added lines, -4 removed lines

@@ -50,14 +50,12 @@
 }
 if (isset($_COOKIE['tempuserid'])) {
     $userid = $_COOKIE['tempuserid'];
-}
-else {
+} else {
     error_page(tra("Website error when attempting to agree to terms of use. Please contact the site administrators."));
 }
 if (isset($_COOKIE['tempperm'])) {
     $perm = $_COOKIE['tempperm'];
-}
-else {
+} else {
     error_page(tra("Website error when attempting to agree to terms of use. Please contact the site administrators."));
 }
 

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/boincimport/boincimport.module

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/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. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     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. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     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      = '';
   }