Passed
Pull Request — master (#5725)
by David
08:56
created
drupal/sites/default/boinc/modules/boincuser/boincuser.module 1 patch
Braces   +15 added lines, -25 removed lines patch added patch discarded remove patch
@@ -418,11 +418,9 @@  discard block
 block discarded – undo
418 418
 
419 419
         if ($edit['boincuser_name']) {
420 420
           $myname = $edit['boincuser_name'];
421
-        }
422
-        else if ($edit['name']) {
421
+        } else if ($edit['name']) {
423 422
           $myname = $edit['name'];
424
-        }
425
-        else {
423
+        } else {
426 424
           $myname = 'noname';
427 425
         }
428 426
 
@@ -434,8 +432,7 @@  discard block
 block discarded – undo
434 432
         // If the 'pass' variable is already a hash, then don't hash it again.
435 433
         if ($edit['boinchash_flag']) {
436 434
           $user_params['passwd_hash'] = $edit['pass'];
437
-        }
438
-        else {
435
+        } else {
439 436
           // The passwd_hash here is only the md5() hash. This is
440 437
           // because BOINC make_user(), called later, will run
441 438
           // password_hash() on this md5 hash.
@@ -506,8 +503,7 @@  discard block
 block discarded – undo
506 503
               $prev_email = $account->mail;
507 504
               $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
508 505
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
509
-            }
510
-            else {
506
+            } else {
511 507
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
512 508
             }
513 509
 
@@ -750,8 +746,7 @@  discard block
 block discarded – undo
750 746
       case FLAG_FRIEND_APPROVAL:
751 747
         if ($action == 'flag') {
752 748
           $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
753
-        }
754
-        elseif ($action == 'unflag') {
749
+        } elseif ($action == 'unflag') {
755 750
           unset($form['actions']);
756 751
           $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
757 752
         }
@@ -1527,8 +1522,7 @@  discard block
 block discarded – undo
1527 1522
         array(
1528 1523
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
1529 1524
         ), NULL, 'boinc:join-page') . '</li>';
1530
-    }
1531
-    else {
1525
+    } else {
1532 1526
       $output .= '<li>' . bts("If you're running a command-line version of BOINC,
1533 1527
         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.",
1534 1528
         array(
@@ -1563,8 +1557,7 @@  discard block
 block discarded – undo
1563 1557
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
1564 1558
         '@sitename' => $site_name,
1565 1559
       ), NULL, 'boinc:join-page') . '</li>';
1566
-    }
1567
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
1560
+    } else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
1568 1561
       $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
1569 1562
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
1570 1563
       ), NULL, 'boinc:join-page') . '</li>';
@@ -1606,8 +1599,7 @@  discard block
 block discarded – undo
1606 1599
   ));
1607 1600
   if ($current_uotd->uotd_time < strtotime('today midnight')) {
1608 1601
     $uotd = boincuser_select_user_of_the_day();
1609
-  }
1610
-  else {
1602
+  } else {
1611 1603
     $uotd = user_load($current_uotd->uid);
1612 1604
   }
1613 1605
   $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
@@ -1618,8 +1610,7 @@  discard block
 block discarded – undo
1618 1610
   $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
1619 1611
   if ($user->uid) {
1620 1612
     $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
1621
-  }
1622
-  else {
1613
+  } else {
1623 1614
     $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
1624 1615
   }
1625 1616
   $output .= '</div>';
@@ -1704,12 +1695,10 @@  discard block
 block discarded – undo
1704 1695
     if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
1705 1696
     password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
1706 1697
       $output = array('authenticator' => $boinc_user->authenticator);
1707
-    }
1708
-    else {
1698
+    } else {
1709 1699
       xml_error(-137);
1710 1700
     }
1711
-  }
1712
-  else {
1701
+  } else {
1713 1702
     // Verify that there isn't somehow a Drupal user already (not possible with proper function)
1714 1703
     if ($existing_user = user_load(array('mail' => $params['email_addr']))) {
1715 1704
       xml_error(-137, 'account error');
@@ -2193,7 +2182,9 @@  discard block
 block discarded – undo
2193 2182
     'cpid' => $cpid
2194 2183
   );
2195 2184
   $args = array();
2196
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
2185
+  foreach ($get as $arg => $value) {
2186
+      $args[] = "{$arg}=" . rawurlencode($value);
2187
+  }
2197 2188
   $query = '?' . implode('&', $args);
2198 2189
   
2199 2190
   // Load XML from RPC
@@ -2324,8 +2315,7 @@  discard block
 block discarded – undo
2324 2315
       if ($node->uid == 0 || strlen($node->name) == 0) {
2325 2316
         // @see user_validate_name(). !'0' === TRUE.
2326 2317
         $document->ss_name = '0';
2327
-      }
2328
-      else {
2318
+      } else {
2329 2319
         $document->ss_name = $account->boincuser_name;
2330 2320
         // We want the name to be searchable for keywords.
2331 2321
         $document->tos_name = $account->boincuser_name;
Please login to merge, or discard this patch.
html/ops/team_import.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -64,8 +64,7 @@  discard block
 block discarded – undo
64 64
             $t->user_postal_code = decode($t->user_postal_code);
65 65
             $t->user_url = decode($t->user_url);
66 66
             return $t;
67
-        }
68
-        else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
67
+        } else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
69 68
         else if (strstr($s, '<url>')) $t->url = parse_element($s, '<url>');
70 69
         else if (strstr($s, '<type>')) $t->type = parse_element($s, '<type>');
71 70
         else if (strstr($s, '<name_html>')) $t->name_html = parse_element($s, '<name_html>');
@@ -74,14 +73,12 @@  discard block
 block discarded – undo
74 73
                 if (strstr($s, '</description>')) break;
75 74
                 $t->description .= $s;
76 75
             }
77
-        }
78
-        else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
76
+        } else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
79 77
         else if (strstr($s, '<id>')) $t->id = parse_element($s, '<id>');
80 78
         else if (strstr($s, '<user_email_munged>')) {
81 79
             $user_email_munged = parse_element($s, '<user_email_munged>');
82 80
             $t->user_email = str_rot13($user_email_munged);
83
-        }
84
-        else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
81
+        } else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
85 82
         else if (strstr($s, '<user_country>')) $t->user_country = parse_element($s, '<user_country>');
86 83
         else if (strstr($s, '<user_postal_code>')) $t->user_postal_code = parse_element($s, '<user_postal_code>');
87 84
         else if (strstr($s, '<user_url>')) $t->user_url = parse_element($s, '<user_url>');
@@ -140,8 +137,7 @@  discard block
 block discarded – undo
140 137
         list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
141 138
         if ($checkct) {
142 139
             echo "   cannot make user when an consent to terms of use is required\n";
143
-        }
144
-        else {
140
+        } else {
145 141
             echo "   making user $t->user_email\n";
146 142
             $user = make_user($t->user_email, $t->user_name, random_string());
147 143
             if (!$user) {
Please login to merge, or discard this patch.
html/ops/manage_consent_types.php 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -46,8 +46,7 @@  discard block
 block discarded – undo
46 46
     if ($toggle == "Click to Enable") {
47 47
         $state = 1;
48 48
         $action = "Enabled";
49
-    }
50
-    else {
49
+    } else {
51 50
         $state = 0;
52 51
         $action = "Disabled";
53 52
     }
@@ -91,12 +90,10 @@  discard block
 block discarded – undo
91 90
         if (!in_rops()) {
92 91
             if (!($ct->enabled)) {
93 92
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Enable\"></td>";
94
-            }
95
-            else {
93
+            } else {
96 94
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Disable\"></td>";
97 95
             }
98
-        }
99
-        else {
96
+        } else {
100 97
             echo "  <td>$ct->enabled</td>";
101 98
         }
102 99
 
@@ -107,12 +104,10 @@  discard block
 block discarded – undo
107 104
         if (!in_rops()) {
108 105
             if (!($ct->privacypref)) {
109 106
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Enable\"></td>";
110
-            }
111
-            else {
107
+            } else {
112 108
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Disable\"></td>";
113 109
             }
114
-        }
115
-        else {
110
+        } else {
116 111
             echo "  <td>$ct->privacypref</td>";
117 112
         }
118 113
 
@@ -156,11 +151,9 @@  discard block
 block discarded – undo
156 151
 
157 152
 if (post_str("add_consenttype", true)) {
158 153
     add_consenttype();
159
-}
160
-else if (post_str("toggleenabled", true)) {
154
+} else if (post_str("toggleenabled", true)) {
161 155
     mct_toggle_field("enabled");
162
-}
163
-else if (post_str("toggleprivacypref", true)) {
156
+} else if (post_str("toggleprivacypref", true)) {
164 157
     mct_toggle_field("privacypref");
165 158
 }
166 159
 
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/boincwork/includes/boincwork.forms.inc 1 patch
Braces   +17 added lines, -34 removed lines patch added patch discarded remove patch
@@ -127,8 +127,7 @@  discard block
 block discarded – undo
127 127
         if (isset($prefs[$name]['@value'])) {
128 128
           $default[$name] = $prefs[$name]['@value'];
129 129
         }
130
-      }
131
-      else {
130
+      } else {
132 131
         $default[$name] = $prefs[$name];
133 132
       }
134 133
     }
@@ -655,8 +654,7 @@  discard block
 block discarded – undo
655 654
   // Save the preset selection (or lack thereof)
656 655
   if (!$preset OR $preset == 'custom') {
657 656
     $prefs['preset'] = 'custom';
658
-  }
659
-  else {
657
+  } else {
660 658
     $prefs['preset'] = $preset;
661 659
   }
662 660
   
@@ -671,8 +669,7 @@  discard block
 block discarded – undo
671 669
   if (!$result) {
672 670
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
673 671
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
674
-  }
675
-  elseif (!drupal_get_messages('status', FALSE)) {
672
+  } elseif (!drupal_get_messages('status', FALSE)) {
676 673
     // Show this message if the set wasn't created automatically (in which case
677 674
     // there is a message tailored to that) {
678 675
     drupal_set_message(t('Your preferences have been updated.
@@ -927,8 +924,7 @@  discard block
 block discarded – undo
927 924
     if (boincwork_host_merge($old_host, $current_host, $message)) {
928 925
       $merged[$old_host->id] = $old_host->id;
929 926
       $current_host = boincwork_host_get_info($current_host_id);
930
-    }
931
-    else {
927
+    } else {
932 928
       $errors[$old_host->id] = $message;
933 929
     }
934 930
   }
@@ -944,8 +940,7 @@  discard block
 block discarded – undo
944 940
         $oxford_comma = '';
945 941
       }
946 942
       $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
947
-    }
948
-    else {
943
+    } else {
949 944
       $list = $last;
950 945
     }
951 946
     if (count($merged) == 1) {
@@ -956,8 +951,7 @@  discard block
 block discarded – undo
956 951
           '@id' => $current_host_id
957 952
         ),
958 953
         NULL, 'boinc:account-host-merge'));
959
-    }
960
-    else {
954
+    } else {
961 955
       drupal_set_message(bts(
962 956
         'Computers @old_ids have been merged successfully into @id.',
963 957
         array(
@@ -1023,11 +1017,9 @@  discard block
 block discarded – undo
1023 1017
     if ($account->boincuser_default_pref_set == $venue) {
1024 1018
       $venue_is_default = TRUE;
1025 1019
     }
1026
-  }
1027
-  elseif (!$venue OR $venue == 'generic') {
1020
+  } elseif (!$venue OR $venue == 'generic') {
1028 1021
     $venue_is_default = TRUE;
1029
-  }
1030
-  else {
1022
+  } else {
1031 1023
     $venue_is_default = FALSE;
1032 1024
   }
1033 1025
   
@@ -1047,8 +1039,7 @@  discard block
 block discarded – undo
1047 1039
         if (isset($prefs[$name]['@value'])) {
1048 1040
           $default[$name] = $prefs[$name]['@value'];
1049 1041
         }
1050
-      }
1051
-      else {
1042
+      } else {
1052 1043
         $default[$name] = $prefs[$name];
1053 1044
       }
1054 1045
     }
@@ -1232,16 +1223,13 @@  discard block
 block discarded – undo
1232 1223
       foreach ($element as $ordered_element) {
1233 1224
         if (isset($ordered_element['@position'])) {
1234 1225
           $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
1235
-        }
1236
-        else {
1226
+        } else {
1237 1227
           $unordered_array[] = array($type => $ordered_element);
1238 1228
         }
1239 1229
       }
1240
-    }
1241
-    elseif (isset($element['@position'])) {
1230
+    } elseif (isset($element['@position'])) {
1242 1231
       $ordered_array[$element['@position']] = array($type => $element);
1243
-    }
1244
-    else {
1232
+    } else {
1245 1233
       $unordered_array[] = array($type => $element);
1246 1234
     }
1247 1235
   }
@@ -1356,8 +1344,7 @@  discard block
 block discarded – undo
1356 1344
   // Update the user's default preference set
1357 1345
   if ($edit['default_set']['default_venue']) {
1358 1346
     boincwork_set_default_venue($venue);
1359
-  }
1360
-  elseif ($venue == $account->boincuser_default_pref_set) {
1347
+  } elseif ($venue == $account->boincuser_default_pref_set) {
1361 1348
     // User has cleared out the default venue setting
1362 1349
     boincwork_set_default_venue();
1363 1350
   }
@@ -1365,8 +1352,7 @@  discard block
 block discarded – undo
1365 1352
   if (!$result) {
1366 1353
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
1367 1354
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
1368
-  }
1369
-  elseif (!drupal_get_messages('status', FALSE)) {
1355
+  } elseif (!drupal_get_messages('status', FALSE)) {
1370 1356
     // Show this message if the set wasn't created automatically (in which case
1371 1357
     // there is a message tailored to that)
1372 1358
     drupal_set_message(t('Your preferences have been updated.
@@ -1519,8 +1505,7 @@  discard block
 block discarded – undo
1519 1505
   // Upload an avatar (pulled from profile_node_form):
1520 1506
   if (!empty($profile_form['field_image'])) {
1521 1507
     $form['field_image'] = $profile_form['field_image'];
1522
-  }
1523
-  else {
1508
+  } else {
1524 1509
     $form['field_image'] = array(
1525 1510
       '#value' => '<div class="form-item">'
1526 1511
         . '<label class="placeholder">'
@@ -1690,8 +1675,7 @@  discard block
 block discarded – undo
1690 1675
       global $base_url;
1691 1676
       if ($edit['language'] != language_default('language')) {
1692 1677
         $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
1693
-      }
1694
-      else {
1678
+      } else {
1695 1679
         $form_state['redirect'] = $base_url . '/' . $_GET['q'];
1696 1680
       }
1697 1681
     }
@@ -1882,8 +1866,7 @@  discard block
 block discarded – undo
1882 1866
       $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
1883 1867
       $rows[] = $row;
1884 1868
     }
1885
-  }
1886
-  else {
1869
+  } else {
1887 1870
     $rows[] = array(
1888 1871
       array(
1889 1872
         'data' => bts('You have not added any users to your Ignore List.', array(), NULL, 'boinc:ignore-user-list'),
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc 1 patch
Braces   +11 added lines, -22 removed lines patch added patch discarded remove patch
@@ -135,8 +135,7 @@  discard block
 block discarded – undo
135 135
   
136 136
   if (!$name) {
137 137
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
138
-  }
139
-  else {
138
+  } else {
140 139
     require_boinc('boinc_db');
141 140
     if (BoincTeam::lookup_name($name)) {
142 141
       form_set_error('name', bts('A team named "@name" already exists.',
@@ -177,8 +176,7 @@  discard block
 block discarded – undo
177 176
   if ($boinc_team) {
178 177
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
179 178
     user_join_team($boinc_team, $boinc_user);
180
-  }
181
-  else {
179
+  } else {
182 180
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
183 181
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
184 182
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
@@ -212,8 +210,7 @@  discard block
 block discarded – undo
212 210
   if (module_exists('pathauto')) {
213 211
     module_load_include('inc', 'pathauto', 'pathauto');
214 212
     $node['path'] = pathauto_cleanstring($values['name']);
215
-  }
216
-  else {
213
+  } else {
217 214
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
218 215
     rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
219 216
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
@@ -381,8 +378,7 @@  discard block
 block discarded – undo
381 378
     $form['form control tabs'] = array(
382 379
       '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
383 380
     );
384
-  }
385
-  else {
381
+  } else {
386 382
     $form['description'] = array(
387 383
       '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
388 384
       '#value' => $default['description'],
@@ -412,12 +408,10 @@  discard block
 block discarded – undo
412 408
   
413 409
   if ($form_state['storage']['is_boinc_wide']) {
414 410
     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'));
415
-  }
416
-  else {
411
+  } else {
417 412
     if (!$name) {
418 413
       form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
419
-    }
420
-    else {
414
+    } else {
421 415
       $team = node_load($form_state['storage']['team_id']);
422 416
       if ($name != $team->title) {
423 417
         // If changing the name ("title" in Drupal terms), check that the new name is available
@@ -559,8 +553,7 @@  discard block
 block discarded – undo
559 553
   
560 554
   if (!$values['username']) {
561 555
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
562
-  }
563
-  else {
556
+  } else {
564 557
     // Load user account associated with username
565 558
     $account = boincuser_privatemsg_name_lookup($values['username']);
566 559
     // Validate the account
@@ -570,24 +563,21 @@  discard block
 block discarded – undo
570 563
           '@username' => $account->boincuser_name
571 564
         ),
572 565
       NULL, 'boinc:team-add-admin'));
573
-    }
574
-    elseif (boincteam_is_founder($team_id, $account->uid)) {
566
+    } elseif (boincteam_is_founder($team_id, $account->uid)) {
575 567
       form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
576 568
         array(
577 569
           '@user' => $account->boincuser_name,
578 570
           '@team' => $team->title,
579 571
         ),
580 572
         NULL, 'boinc:team-add-admin'));
581
-    }
582
-    elseif (boincteam_is_admin($team_id, $account->uid)) {
573
+    } elseif (boincteam_is_admin($team_id, $account->uid)) {
583 574
       form_set_error('username', bts('@user is already an admin of @team.',
584 575
         array(
585 576
           '@user' => $account->boincuser_name,
586 577
           '@team' => $team->title,
587 578
         ),
588 579
         NULL, 'boinc:team-add-admin'));
589
-    }
590
-    else {
580
+    } else {
591 581
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;
592 582
       $form_state['storage']['boincuser_name'] = $account->boincuser_name;
593 583
     }
@@ -645,8 +635,7 @@  discard block
 block discarded – undo
645 635
   if (isset($form_state['values'])) {
646 636
     $subject   = $form_state['values']['subject'];
647 637
     $body      = $form_state['values']['body'];
648
-  }
649
-  else {
638
+  } else {
650 639
     $subject   = '';
651 640
     $body      = '';
652 641
   }
Please login to merge, or discard this patch.
html/user/account_ownership.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,8 @@
 block discarded – undo
120 120
   // GET request - the user has navigated to the page.
121 121
   page_head(tra("Generate proof of account ownership"), null, null, null, boinc_recaptcha_get_head_extra());
122 122
 
123
-  if ($user) { // Verify the user is logged in
123
+  if ($user) {
124
+// Verify the user is logged in
124 125
       require_once("../inc/account_ownership.inc");
125 126
 
126 127
       if (!file_exists($account_ownership_private_key_file_path)) {
Please login to merge, or discard this patch.
sites/default/boinc/modules/flag_abuse_reason/flag_abuse_reason.module 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -66,8 +66,7 @@  discard block
 block discarded – undo
66 66
         $vars['action'] = 'none';
67 67
         $vars['link_text'] = t('Reset Completely');
68 68
         $vars['link_title'] = t('Reset everying, allows users to re-flag content.');
69
-      }
70
-      else {
69
+      } else {
71 70
         $vars['action'] = 'none';
72 71
         $vars['link_text'] = t('Locked');
73 72
         $vars['link_title'] = t('Reporting locked by moderator.');
@@ -75,8 +74,7 @@  discard block
 block discarded – undo
75 74
         $vars['link_href'] = '';
76 75
         $vars['flag_classes'] = 'flag style-like-link';
77 76
       }
78
-    }
79
-    else {
77
+    } else {
80 78
       // If there are flags on this content, clear the flags and
81 79
       // lock the content.
82 80
       if (user_access('reset abuse flags', $myuser)) {
@@ -121,8 +119,7 @@  discard block
 block discarded – undo
121 119
         drupal_set_message(bts('INFO: Reset everything. Users may reflag this content.', array(), NULL, 'boinc:flag-abuse-reset'), 'info');
122 120
         // unlock flag; effectively resets flags for this content
123 121
         variable_del($flag->name.'-'.$content_id);
124
-      }
125
-      else {
122
+      } else {
126 123
         // Clear and Lock all flags on this content.
127 124
         $dbresult = db_query("SELECT DISTINCT fid FROM {flag_content} WHERE content_id = %d", $content_id);
128 125
         $rows = 0;
Please login to merge, or discard this patch.
drupal/sites/all/features/boinc_standard/boinc_standard.features.inc 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,14 +7,11 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "input_formats" && $api == "input_formats") {
9 9
     return array("version" => 1);
10
-  }
11
-  elseif ($module == "page_manager" && $api == "pages_default") {
10
+  } elseif ($module == "page_manager" && $api == "pages_default") {
12 11
     return array("version" => 1);
13
-  }
14
-  elseif ($module == "panels_mini" && $api == "panels_default") {
12
+  } elseif ($module == "panels_mini" && $api == "panels_default") {
15 13
     return array("version" => 1);
16
-  }
17
-  elseif ($module == "strongarm" && $api == "strongarm") {
14
+  } elseif ($module == "strongarm" && $api == "strongarm") {
18 15
     return array("version" => 1);
19 16
   }
20 17
 }
Please login to merge, or discard this patch.
html/inc/translation.inc 1 patch
Braces   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
             continue;
69 69
         }
70 70
         // only do files ending in .po
71
-        if (substr($file,-3) != ".po"){
71
+        if (substr($file,-3) != ".po") {
72 72
             //debug("File $file with unknown extension found in $info_dir");
73 73
             continue;
74 74
         }
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             "-------------Compiling $transdir$file------------", 0
77 77
         );
78 78
         $language = parse_po_file($langdir.$transdir.$file);
79
-        if (!$language){
79
+        if (!$language) {
80 80
             language_log(
81 81
                 "WARNING: Could not parse language ".$file
82 82
             );
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
             );
96 96
             exit;
97 97
         }
98
-        foreach ($language as $key => $value){
98
+        foreach ($language as $key => $value) {
99 99
             if ($value !== "") {
100 100
                 // Skip if the msgstr is empty
101 101
                 fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
@@ -121,13 +121,13 @@  discard block
 block discarded – undo
121 121
     $parsing_text = false;
122 122
     $size = sizeof($translation_file);
123 123
     $output = array();
124
-    for ($i=0; $i<$size; $i++){
124
+    for ($i=0; $i<$size; $i++) {
125 125
         $entry = trim($translation_file[$i]);
126 126
         //echo "line $i: $entry\n";
127 127
         if (substr($entry, 0, 1)=="#") {
128 128
             continue;
129 129
         } elseif (strpos($entry, "msgid") !== false) {
130
-            if (!$first_entry){
130
+            if (!$first_entry) {
131 131
                 //If this is not the first, save the previous entry
132 132
                 $output[$current_token]=$current_token_text;
133 133
             }
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 
150 150
     // Get the last token
151 151
     //
152
-    if ($current_token && $current_token_text){
152
+    if ($current_token && $current_token_text) {
153 153
         $output[$current_token] = $current_token_text;
154 154
     }
155 155
     return $output;
@@ -180,11 +180,11 @@  discard block
 block discarded – undo
180 180
 
181 181
     // Find the string in the user's language
182 182
     //
183
-    foreach ($languages_in_use as $language){
183
+    foreach ($languages_in_use as $language) {
184 184
         if (isset($language_lookup_array[$language][$text])) {
185 185
             $text = $language_lookup_array[$language][$text];
186 186
             break;
187
-        } else if ($language=="en"){
187
+        } else if ($language=="en") {
188 188
             // This language is defined in the code and is always available
189 189
             break;
190 190
         }
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
     // Replace relevant substrings with given arguments.
194 194
     // Use strtr to avoid problems if an argument contains %n.
195 195
     $replacements = array();
196
-    for ($i=1; $i<func_num_args(); $i++){
196
+    for ($i=1; $i<func_num_args(); $i++) {
197 197
         $replacements["%".$i] = func_get_arg($i);
198 198
     }
199 199
 
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
     if ($loglevel==1) $msg = "[ Warning  ]";
218 218
     if ($loglevel==2) $msg = "[ CRITICAL ]";
219 219
 
220
-    if ($loglevel >= $lang_log_level){
220
+    if ($loglevel >= $lang_log_level) {
221 221
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";
222 222
     }
223 223
 }
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 // (by looking at cookies and browser settings)
227 227
 // cookies have highest priority.
228 228
 
229
-if (isset($_COOKIE['lang'])){
229
+if (isset($_COOKIE['lang'])) {
230 230
     $language_string = $_COOKIE['lang'].",";
231 231
 } else {
232 232
     $language_string = '';
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 for ($i=0; $i<$size; $i++) {
261 261
     if ((strlen($client_languages[$i])>2)
262 262
         && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")
263
-    ){
263
+    ) {
264 264
         // If this is defined as primary-secondary, represent it as xx_YY
265 265
         //
266 266
         $language = substr(
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
     //
288 288
     $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc";
289 289
     if (file_exists($file_name)) {
290
-        if (!in_array($language, $languages_in_use)){
290
+        if (!in_array($language, $languages_in_use)) {
291 291
             require_once($file_name);
292 292
             $languages_in_use[] = $language;
293 293
         }
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
     if ($language2) {
296 296
         $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc";
297 297
         if (file_exists($file_name)) {
298
-            if (!in_array($language2, $languages_in_use)){
298
+            if (!in_array($language2, $languages_in_use)) {
299 299
                 require_once($file_name);
300 300
                 $languages_in_use[] = $language2;
301 301
             }
Please login to merge, or discard this patch.