BOINC / boinc

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

Braces +9 added lines, -18 removed lines

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

drupal/sites/default/boinc/modules/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/boinctranslate/includes/boinctranslate.helpers.inc

Braces +76 added lines, -125 removed lines

@@ -36,8 +36,7 @@ 
           )
         ), 'warning'
       );
-    }
-    elseif ($response) {
+    } elseif ($response) {
       if (is_array($response)) {
 
         $installed_languages = language_list();
@@ -67,8 +66,7 @@ 
                 'Added predefined language: '.$available_languages[$rfc_code][0]
               );
               db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
-            }
-            else {
+            } else {
               // Retrieve language details from Transifex
               $path = "language/{$posix_code}";
               $response = boinctranslate_transifex_request($path);
@@ -81,8 +79,7 @@ 
                     )
                   ), 'warning'
                 );
-              }
-              elseif ($response) {
+              } elseif ($response) {
                 if (!empty($response['name'])) {
                   // Add a custom language to Drupal and enable
                   locale_add_language(
@@ -97,8 +94,7 @@ 
                   drupal_set_message(
                     'Added new language: '.$response['name']
                   );
-                }
-                else {
+                } else {
                   $variables = array(
                     '%code' => $posix_code,
                   );
@@ -113,8 +109,7 @@ 
                     WATCHDOG_ERROR
                   );
                 }
-              }
-              else {
+              } else {
                $variables = array(
                   '%code' => $posix_code,
                 );
@@ -155,8 +150,7 @@ 
           batch_set($batch);
           batch_process('admin/boinc/translation');
         }
-      }
-      else {
+      } else {
         $variables = array(
           '%project' => $project_name,
         );
@@ -171,8 +165,7 @@ 
           WATCHDOG_ERROR
         );
       }
-    }
-    else {
+    } else {
      $variables = array(
         '%project' => $project_name,
       );
@@ -229,8 +222,7 @@ 
           'content' => boinctranslate_get_po('en', 'project'),
         );
         $result = boinctranslate_transifex_request($path, $post);
-      }
-      else {
+      } else {
         // Update the source
         $path = "project/{$project_name}/resource/{$primary_resource}/content";
         $post = array(
@@ -244,8 +236,7 @@ 
       $enabled_languages = locale_language_list();
       if ($source_exists) {
         drupal_set_message('Updated source translation strings at Transifex');
-      }
-      else {
+      } else {
         drupal_set_message('Established new translation resource at Transifex');
       }
       // Try to export translations for all enabled languages
@@ -266,25 +257,21 @@ 
               "Unable to update {$language_name} translations: {$result}",
               'warning'
             );
-          }
-          else {
+          } else {
             drupal_set_message("Updated {$language_name} translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
           }
-        }
-        else {
+        } else {
           drupal_set_message("No translations to export for {$language_name}");
         }
       }
-    }
-    else {
+    } else {
       drupal_set_message(
         "Unable to update the translation source: {$result}",
         'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       'Failed to export translations: Transifex settings are not intiailized.',
       'error'
@@ -340,42 +327,35 @@ 
                 "Unable to update {$language_name} official BOINC translations: {$result}",
                 'warning'
               );
-            }
-            elseif ($result == '401 UNAUTHORIZED') {
+            } elseif ($result == '401 UNAUTHORIZED') {
               drupal_set_message(
                 'Not authorized to update official BOINC translations',
                 'warning'
               );
               break;
-            }
-            elseif ($result == 'success') {
+            } elseif ($result == 'success') {
               drupal_set_message("Updated {$language_name} official BOINC translations");
-            }
-            else {
+            } else {
               drupal_set_message(
                 "Unexpected response for {$language_name}: {$result}",
                 'warning'
               );
             }
-          }
-          else {
+          } else {
             drupal_set_message("Updated {$language_name} official BOINC translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
           }
-        }
-        else {
+        } else {
           drupal_set_message("No official BOINC translations to export for {$language_name}");
         }
       }
-    }
-    else {
+    } else {
       drupal_set_message(
         "The {$drupal_resource} resource does not exist in the {$project_name} project at Transifex",
         'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       'Failed to export official BOINC translations: Transifex settings are not intiailized.',
       'error'
@@ -413,13 +393,11 @@ 
     if ($json) {
       $headers['Content-Type'] = 'application/json';
       $data = json_encode($post);
-    }
-    else {
+    } else {
       $data = drupal_query_string_encode($post);
     }
     $method = ($use_put) ? 'PUT' : 'POST';
-  }
-  else {
+  } else {
     $method = 'GET';
   }
 
@@ -431,8 +409,7 @@ 
     if ($json) {
       // Process as JSON
       return json_decode($response->data, TRUE);
-    }
-    else {
+    } else {
       return (string) $response->data;
     }
     break;
@@ -582,18 +559,15 @@ 
             if ($plural) {
               $translation = _locale_export_remove_plural($strings[$plural]['translation']);
               $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
-            }
-            else {
+            } else {
               $translation = '';
             }
           }
-        }
-        else {
+        } else {
           $output .= 'msgstr[0] ""' . "\n";
           $output .= 'msgstr[1] ""' . "\n";
         }
-      }
-      else {
+      } else {
         $output .= 'msgstr ' . _locale_export_string($string['translation']);
       }
       $output .= "\n";
@@ -671,8 +645,7 @@ 
               if ($tl0) {
                 bts($tl0);
               }
-            }
-            elseif (count($line)>1) {
+            } elseif (count($line)>1) {
               $tl0 = trim($line[0]);
               $tl1 = trim($line[1]);
               if ($tl0 and $tl1) {
@@ -761,8 +734,7 @@ 
 
     if ($response == '404 NOT FOUND') {
       $message = "Project resource {$project}:{$resource} not found in {$language}.";
-    }
-    elseif ($response) {
+    } elseif ($response) {
       if (!empty($response['content'])) {
         $po_text = $response['content'];
 
@@ -783,23 +755,19 @@ 
               . " {$project}:{$resource} failed.";
             $success = FALSE;
             break;
-          }
-          else {
+          } else {
             $success = TRUE;
           }
         }
-      }
-      else {
+      } else {
         $message = "Unable to read response for {$language} translation import"
           . " of {$project}:{$resource}.";
       }
-    }
-    else {
+    } else {
       $message = "Translation data not found in response for {$language}"
         . " translation import of {$project}:{$resource}.";
     }
-  }
-  else {
+  } else {
     // If project isn't specified, import as a local Drupal resource
     $project = 'drupal.local';
     $file = new stdClass();
@@ -809,8 +777,7 @@ 
       $message = "The {$language} translation import of"
         . " local file {$resource} failed.";
       $success = FALSE;
-    }
-    else {
+    } else {
       $success = TRUE;
     }
   }
@@ -828,8 +795,7 @@ 
         WATCHDOG_INFO
       );
     }
-  }
-  else {
+  } else {
     $context['results']['failure'][] = "{$langcode}:{$textgroup}";
     watchdog(
       'boinctranslate',
@@ -847,8 +813,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'];
   }
 }
@@ -867,8 +832,7 @@ 
       array('@count' => $count),
       WATCHDOG_INFO
     );
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -963,17 +927,19 @@ 
     $lineno++;
     $line = trim(strtr($line, array("\\\n" => "")));
 
-    if (!strncmp("#", $line, 1)) { // A comment
-      if ($context == "COMMENT") { // Already in comment context: add
+    if (!strncmp("#", $line, 1)) {
+// A comment
+      if ($context == "COMMENT") {
+// Already in comment context: add
         $current["#"][] = substr($line, 1);
-      }
-      elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+      } elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
+// End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
         $current["#"][] = substr($line, 1);
         $context = "COMMENT";
-      }
-      else { // Parse error
+      } else {
+// Parse error
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgstr" was expected but not found on line %line.',
@@ -983,13 +949,13 @@ 
         _locale_import_message('The translation file %filename contains an error: "msgstr" was expected but not found on line %line.', $file, $lineno);
         return FALSE;
       }
-    }
-    elseif (!strncmp("msgctxt", $line, 7)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+    } elseif (!strncmp("msgctxt", $line, 7)) {
+      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
+// End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif (($context == "MSGID") || ($context == "MSGCTXT")) { // Already in this context? Parse error
+      } elseif (($context == "MSGID") || ($context == "MSGCTXT")) {
+// Already in this context? Parse error
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgctxt" is unexpected on line %line.',
@@ -1013,9 +979,9 @@ 
       }
       $current["msgctxt"] = $quoted;
       $context = "MSGCTXT";
-    }
-    elseif (!strncmp("msgid_plural", $line, 12)) {
-      if ($context != "MSGID") { // Must be plural form for current entry
+    } elseif (!strncmp("msgid_plural", $line, 12)) {
+      if ($context != "MSGID") {
+// Must be plural form for current entry
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
@@ -1039,13 +1005,13 @@ 
       }
       $current["msgid"] = $current["msgid"] . "\0" . $quoted;
       $context = "MSGID_PLURAL";
-    }
-    elseif (!strncmp("msgid", $line, 5)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+    } elseif (!strncmp("msgid", $line, 5)) {
+      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
+// End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif ($context == "MSGID") { // Already in this context? Parse error
+      } elseif ($context == "MSGID") {
+// Already in this context? Parse error
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgid" is unexpected on line %line.',
@@ -1069,9 +1035,9 @@ 
       }
       $current["msgid"] = $quoted;
       $context = "MSGID";
-    }
-    elseif (!strncmp("msgstr[", $line, 7)) {
-      if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
+    } elseif (!strncmp("msgstr[", $line, 7)) {
+      if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) {
+// Must come after msgid, msgid_plural, or msgstr[]
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
@@ -1107,9 +1073,9 @@ 
       }
       $current["msgstr"][$plural] = $quoted;
       $context = "MSGSTR_ARR";
-    }
-    elseif (!strncmp("msgstr", $line, 6)) {
-      if ($context != "MSGID") { // Should come just after a msgid block
+    } elseif (!strncmp("msgstr", $line, 6)) {
+      if ($context != "MSGID") {
+// Should come just after a msgid block
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
@@ -1133,8 +1099,7 @@ 
       }
       $current["msgstr"] = $quoted;
       $context = "MSGSTR";
-    }
-    elseif ($line != "") {
+    } elseif ($line != "") {
       $quoted = _locale_import_parse_quoted($line);
       if ($quoted === FALSE) {
         watchdog(
@@ -1148,14 +1113,11 @@ 
       }
       if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
         $current["msgid"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR") {
+      } elseif ($context == "MSGSTR") {
         $current["msgstr"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR_ARR") {
+      } elseif ($context == "MSGSTR_ARR") {
         $current["msgstr"][$plural] .= $quoted;
-      }
-      else {
+      } else {
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: there is an unexpected string on line %line.',
@@ -1171,8 +1133,7 @@ 
   // End of PO file, flush last entry
   if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
     _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
-  }
-  elseif ($context != "COMMENT") {
+  } elseif ($context != "COMMENT") {
     watchdog(
       'boinctranslate',
       'The translation file %filename for %lang ended unexpectedly at line %line.',
@@ -1239,9 +1200,7 @@ 
           }
         }
         $headerdone = TRUE;
-      }
-
-      else {
+      } else {
         // Some real string to import.
         $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
 
@@ -1260,9 +1219,7 @@ 
             }
             $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
           }
-        }
-
-        else {
+        } else {
           // A simple string to import.
           $english = $value['msgid'];
           $translation = $value['msgstr'];
@@ -1293,8 +1250,7 @@ 
   $uselocation = array("boinc", "project");
   if (in_array($textgroup, $uselocation)) {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s' AND textgroup = '%s'", $location, $source, $textgroup);
-  }
-  else {
+  } else {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s'", $source, $textgroup);
 
     // Parse the location string for the string ignoreoverwrite, which
@@ -1316,8 +1272,7 @@ 
     if ($textgroup == "default" && !locale_string_is_safe($translation)) {
       $report['skips']++;
       $lid = 0;
-    }
-    elseif ($resource) {
+    } elseif ($resource) {
       // We have this source string saved already. Loop over the db results from locales_source table.
       while ($row = db_fetch_array($resource)) {
 
@@ -1328,20 +1283,17 @@ 
           // No translation in this language, insert translation into locales_target table.
           db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
           $report['additions']++;
-        }
-        else if ( ($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite) ) {
+        } else if ( ($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite) ) {
           // Translation exists, only overwrite if instructed.
           db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
           $report['updates']++;
-        }
-        else {
+        } else {
           $report['skips']++;
         }// end if !$exists
 
       }// while
     }
-  }
-  elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
+  } elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
       $lid = $row['lid'];
@@ -1352,8 +1304,7 @@ 
         $report['deletes']++;
       }// if $exists
     }// while
-  }
-  else {
+  } else {
     $report['skips']++;
   }
 

drupal/sites/default/boinc/themes/boinc/template.php

Braces +15 added lines, -29 removed lines

@@ -130,8 +130,7 @@ 
   AND strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
-  }
-  else {
+  } else {
     return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
   }
 }
@@ -218,17 +217,13 @@ 
   // See: https://dev.gridrepublic.org/browse/DBOINC-65
   if (arg(0) == 'search') {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+  } else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+  } else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='dashboard') ) {
+  } else if ( (arg(0)=='dashboard') ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+  } else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
     unset($vars['title']);
   }
 
@@ -246,8 +241,7 @@ 
           if ($key == $last_key) {
               $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
           }
-      }
-      elseif (strpos($tab, 'li ')) {
+      } elseif (strpos($tab, 'li ')) {
           if ($key == 0) {
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
@@ -400,8 +394,7 @@ 
         $cid = boincuser_get_first_unread_comment_id($topic->nid);
         if ($cid) {
           $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
-        }
-        else {
+        } else {
           // User hasn't visited this topic before, so all replies are new...
           $topic->new_replies = NULL;
         }
@@ -458,8 +451,7 @@ 
   case 'boinc_host_list':
     if ($vars['display_id'] == 'page_2') {
      $vars['empty'] = boincwork_views_host_list_empty_text();
-    }
-    elseif ($vars['display_id'] == 'page_1') {
+    } elseif ($vars['display_id'] == 'page_1') {
       $vars['empty'] = boincwork_views_host_list_empty_text('active');
     }
     break;
@@ -515,8 +507,7 @@ 
   if ($user_image) {
     if (is_array($user_image) AND $user_image['image']['filepath']) {
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-    }
-    elseif (is_string($user_image)) {
+    } elseif (is_string($user_image)) {
       $author_picture .= '<img src="' . $user_image . '"/>';
     }
   }
@@ -620,26 +611,22 @@ 
 
     if (user_access('access user profiles')) {
       $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
-    }
-    else {
+    } else {
       $output = check_plain($name);
     }
-  }
-  else if ($object->name) {
+  } else if ($object->name) {
     // Sometimes modules display content composed by people who are
     // not registered members of the site (e.g. mailing list or news
     // aggregator modules). This clause enables modules to display
     // the true author of the content.
     if (!empty($object->homepage)) {
       $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
-    }
-    else {
+    } else {
       $output = check_plain($object->name);
     }
 
     $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
-  }
-  else {
+  } else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
   }
 
@@ -724,7 +711,7 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);
@@ -913,8 +900,7 @@ 
         ),
       );
     }
-  }
-  else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
+  } else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
     if (!isset($ignored[$object->uid])) {
       $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
     }

html/ops/bbcode_convert_response1.php

Braces +4 added lines, -3 removed lines

@@ -43,14 +43,15 @@
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
     $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 profiles
+        if ($i%100 == 0) {
+//For every 100 profiles
             echo $profile->userid.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

html/ops/dbinfo.php

Braces +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 
 
 // returns formatted data size
-function size_format($size){
+function size_format($size) {
 	$retval = 0;
 
 	$KB = 1024;
@@ -126,7 +126,7 @@ 
 	echo "<th>Avg. Size per Row</th>";
 	echo "</tr>";
 
-	for ($i = 0; $i < sizeof($db_rec)-1; $i++){
+	for ($i = 0; $i < sizeof($db_rec)-1; $i++) {
 		echo "<tr>";
 		echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>";
 		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size)  . "</td>";
@@ -172,7 +172,7 @@ 
     }
 	if (empty($r)) $r=0;
 
-	for ($i=0; $i < sizeof($db_rec)-1; $i++){
+	for ($i=0; $i < sizeof($db_rec)-1; $i++) {
 		$file_details["name"]         = $db_rec[$i]->name;
 		$file_details["data_size"]    = $db_rec[$i]->data_size;
 		$file_details["index_size"]   = $db_rec[$i]->index_size;

html/inc/user_util.inc

Braces +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
             $users = BoincUser::enum(
                 sprintf("name like '%s%%'", $new_name)
             );
-            foreach ($users as $u){
+            foreach ($users as $u) {
                 echo "<p>$u->name\n";
             }
             page_tail();

html/user/edit_forum_preferences_action.php

Braces +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
 }
 BoincForumPrefs::lookup($user);
 
-if (post_str("action", true)=="reset_confirm"){
+if (post_str("action", true)=="reset_confirm") {
     page_head(tra("Confirm reset"));
     echo tra("This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button.")."
         <p>
@@ -45,7 +45,7 @@ 
 // If the user has requested a reset of preferences;
 // preserve a few fields.
 //
-if (post_str("action", true)=="reset"){
+if (post_str("action", true)=="reset") {
     $posts = $user->prefs->posts;
     $last_post = $user->prefs->last_post;
     $rated_posts = $user->prefs->rated_posts;
@@ -71,8 +71,8 @@ 
 
 // Update the user avatar
 if ($avatar_type<0 or $avatar_type>3) $avatar_type=0;
-if ($avatar_type==0){
-    if (file_exists($newfile)){
+if ($avatar_type==0) {
+    if (file_exists($newfile)) {
         // Delete the file on the server if the user
         // decides not to use an avatar
         //
@@ -81,7 +81,7 @@ 
     $avatar_url="";
 } elseif ($avatar_type == 1) {
     $avatar_url = "//www.gravatar.com/avatar/".md5($user->email_addr)."?s=100&amp;d=identicon";
-} elseif ($avatar_type==2){
+} elseif ($avatar_type==2) {
     if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name']!="")) {
         if ($_FILES['picture']['tmp_name']!="") {
             $file = $_FILES['picture']['tmp_name'];
@@ -90,7 +90,7 @@ 
             $file = post_str("avatar_url");
         }
         $size = getImageSize($file);
-        if ($size[2]!=2 and $size[2]!=3){
+        if ($size[2]!=2 and $size[2]!=3) {
             //Not the right kind of file
             error_page(tra("Error: Not the right kind of file, only PNG and JPEG are supported."));
         }
@@ -99,7 +99,7 @@ 
         $image2 = intelligently_scale_image($file, 100, 100);
         ImageJPEG($image2, $newfile);
     }
-    if (file_exists($newfile)){
+    if (file_exists($newfile)) {
         $avatar_url=IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
     } else {
         //User didn't upload a compatible file or it went lost on the server
@@ -142,9 +142,9 @@ 
 } else {
     // todo: clean up the following
     $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"]!="");
-    if ($add_user_to_filter){
+    if ($add_user_to_filter) {
         $user_to_add = trim($_POST["forum_filter_user"]);
-        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))){
+        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))) {
             $other_user = BoincUser::lookup_id($user_to_add);
             if (!$other_user) {
                 echo tra("No such user:")." ".$user_to_add;
@@ -159,9 +159,9 @@ 
 //
 $ignored_users = get_ignored_list($user);
 // todo: use foreach
-for ($i=0;$i<sizeof($ignored_users);$i++){
+for ($i=0;$i<sizeof($ignored_users);$i++) {
     $remove = "remove".trim($ignored_users[$i]);
-    if (isset($_POST[$remove]) && $_POST[$remove]!=""){
+    if (isset($_POST[$remove]) && $_POST[$remove]!="") {
         $other_user = BoincUser::lookup_id($ignored_users[$i]);
         if (!$other_user) {
             echo tra("No such user:")." ".$ignored_users[$j];

html/user/edit_forum_preferences_form.php

Braces +5 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
 // ------------ Forum identity -----------
 
 $select_0 = $select_1 = $select_2 = "";
-if (strlen($user->prefs->avatar)){
-    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar
+if (strlen($user->prefs->avatar)) {
+    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") {
+// Gravatar
         $select_1 = "checked=\"true\"";
     } else {
         $select_2 = "checked=\"true\"";
@@ -73,7 +74,7 @@ 
     <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2.">
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
 );
-if (strlen($user->prefs->avatar)){
+if (strlen($user->prefs->avatar)) {
     row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
 }
@@ -103,7 +104,7 @@ 
         tra("Attach signature by default")
     )
 );
-if ($user->prefs->signature!=""){
+if ($user->prefs->signature!="") {
     row2(tra("Signature preview").
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
         output_transform($user->prefs->signature)