Completed
Pull Request — master (#2190)
by Christian
14:01
created
html/user/donations.php 1 patch
Braces   +15 added lines, -30 removed lines patch added patch discarded remove patch
@@ -98,50 +98,35 @@
 block discarded – undo
98 98
 $amount = "<select class=\"form-control\" name=\"from\" onchange=\"Cvalue();numberFormat();\" style=\"width: 200px;\">\n";
99 99
 if (DONATION_CURRENCY == "EUR") {
100 100
     $amount .= "<option value=\"51\">Euros</option>\n";
101
-}
102
-elseif (DONATION_CURRENCY == "CAD") {
101
+} elseif (DONATION_CURRENCY == "CAD") {
103 102
     $amount .= "<option value=\"30\">Canadian Dollars</option>\n";
104
-}
105
-elseif (DONATION_CURRENCY == "GBP") {
103
+} elseif (DONATION_CURRENCY == "GBP") {
106 104
     $amount .= "<option value=\"24\">Pounds Sterling</option>\n";
107
-}
108
-elseif (DONATION_CURRENCY == "USD") {
105
+} elseif (DONATION_CURRENCY == "USD") {
109 106
     $amount .= "<option value=\"3\">U.S. Dollars</option>\n";
110
-}
111
-elseif (DONATION_CURRENCY == "JPY") {
107
+} elseif (DONATION_CURRENCY == "JPY") {
112 108
     $amount .= "<option value=\"72\">Yen</option>\n";
113
-}
114
-elseif (DONATION_CURRENCY == "AUD") {
109
+} elseif (DONATION_CURRENCY == "AUD") {
115 110
     $amount .= "<option value=\"9\">Australian Dollars</option>\n";
116
-}
117
-elseif (DONATION_CURRENCY == "NZD") {
111
+} elseif (DONATION_CURRENCY == "NZD") {
118 112
     $amount .= "<option value=\"102\">New Zealand Dollars</option>\n";
119
-}
120
-elseif (DONATION_CURRENCY == "CHF") {
113
+} elseif (DONATION_CURRENCY == "CHF") {
121 114
     $amount .= "<option value=\"139\">Swiss Francs</option>\n";
122
-}
123
-elseif (DONATION_CURRENCY == "HKD") {
115
+} elseif (DONATION_CURRENCY == "HKD") {
124 116
     $amount .= "<option value=\"63\">Hong Kong Dollars</option>\n";
125
-}
126
-elseif (DONATION_CURRENCY == "SGD") {
117
+} elseif (DONATION_CURRENCY == "SGD") {
127 118
     $amount .= "<option value=\"126\">Singapore Dollars</option>\n";
128
-}
129
-elseif (DONATION_CURRENCY == "SEK") {
119
+} elseif (DONATION_CURRENCY == "SEK") {
130 120
     $amount .= "<option value=\"138\">Swedish Kronor</option>\n";
131
-}
132
-elseif (DONATION_CURRENCY == "DKK") {
121
+} elseif (DONATION_CURRENCY == "DKK") {
133 122
     $amount .= "<option value=\"42\">Danish Kroner</option>\n";
134
-}
135
-elseif (DONATION_CURRENCY == "PLN") {
123
+} elseif (DONATION_CURRENCY == "PLN") {
136 124
     $amount .= "<option value=\"114\">Polish Zloty</option>\n";
137
-}
138
-elseif (DONATION_CURRENCY == "NOK") {
125
+} elseif (DONATION_CURRENCY == "NOK") {
139 126
     $amount .= "<option value=\"106\">Norwegian Kroner</option>\n";
140
-}
141
-elseif (DONATION_CURRENCY == "HUF") {
127
+} elseif (DONATION_CURRENCY == "HUF") {
142 128
     $amount .= "<option value=\"64\">Hungarian Forint</option>\n";
143
-}
144
-elseif (DONATION_CURRENCY == "CZK") {
129
+} elseif (DONATION_CURRENCY == "CZK") {
145 130
     $amount .= "<option value=\"41\">Czech Koruna</option>\n";
146 131
 }
147 132
 $amount .= "</select>\n";
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/nicedit.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -108,8 +108,7 @@
 block discarded – undo
108 108
       if (file_exists($css)) {
109 109
         $settings['externalCSS'] = base_path() . $css;
110 110
       }
111
-    }
112
-    else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
111
+    } else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
113 112
       $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
114 113
     }
115 114
   }
Please login to merge, or discard this patch.
drupal/sites/all/features/spam_controls/spam_controls.features.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "context" && $api == "context") {
9 9
     return array("version" => 3);
10
-  }
11
-  elseif ($module == "strongarm" && $api == "strongarm") {
10
+  } elseif ($module == "strongarm" && $api == "strongarm") {
12 11
     return array("version" => 1);
13 12
   }
14 13
 }
Please login to merge, or discard this patch.
drupal/sites/all/features/discussion_forums/discussion_forums.features.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "context" && $api == "context") {
9 9
     return array("version" => 3);
10
-  }
11
-  elseif ($module == "strongarm" && $api == "strongarm") {
10
+  } elseif ($module == "strongarm" && $api == "strongarm") {
12 11
     return array("version" => 1);
13 12
   }
14 13
 }
Please login to merge, or discard this patch.
html/ops/bbcode_convert_response2.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,14 +43,15 @@
 block discarded – undo
43 43
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
44 44
     echo _mysql_error();
45 45
     $i=0;
46
-    while ($profile = _mysql_fetch_object($profiles)){
46
+    while ($profile = _mysql_fetch_object($profiles)) {
47 47
         $i++; 
48
-        if ($i%100 == 0) {                      //For every 100 profiles
48
+        if ($i%100 == 0) {
49
+//For every 100 profiles
49 50
             echo $profile->userid.". "; flush();   // print out where we are
50 51
             //usleep(200000);
51 52
         }
52 53
         
53
-        if ($profile->userid > $start_id){
54
+        if ($profile->userid > $start_id) {
54 55
             fix_profile($profile);
55 56
         }
56 57
     }
Please login to merge, or discard this patch.
html/ops/bolt_map.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -243,7 +243,7 @@
 block discarded – undo
243 243
             <td><br></td>
244 244
             <td><br></td>
245 245
         ";
246
-    } else  {
246
+    } else {
247 247
         $c = class_name($class);
248 248
         echo "
249 249
             <td><b>".spaces($level)."$unit->name</b></td>
Please login to merge, or discard this patch.
html/ops/make_emails_lowercase.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,8 +75,7 @@  discard block
 block discarded – undo
75 75
   if (!(strcmp($cpid,"0"))) {
76 76
     $newcpid=random_string();
77 77
     echo "Problematic CPID=0 for [$id] $email_addr gets CPID=$newcpid<br/>";
78
-  }
79
-  else
78
+  } else
80 79
     $newcpid=$cpid;
81 80
   
82 81
   if (strcmp($email_addr, $new_email) || strcmp($newcpid,$cpid)) {
@@ -84,8 +83,7 @@  discard block
 block discarded – undo
84 83
     if ($confirm != "yes") {
85 84
       echo "QUERY WOULD BE [$id] $query <br/>[click the link at the bottom to enable]<br/>";
86 85
       $update_needed = TRUE;
87
-    }
88
-    else {
86
+    } else {
89 87
       _mysql_query($update);
90 88
       echo "Doing $update<br/>\n";
91 89
     }
Please login to merge, or discard this patch.
html/ops/manage_special_users.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     FROM forum_preferences as prefs, user 
38 38
     WHERE CONVERT(special_user, DECIMAL) > 0 and prefs.userid=user.id"
39 39
 );
40
-for ($i=1; $i<=_mysql_num_rows($result); $i++){
40
+for ($i=1; $i<=_mysql_num_rows($result); $i++) {
41 41
 	$foo = _mysql_fetch_object($result);
42 42
     echo "<form action=\"manage_special_users_action.php\" method=\"POST\">\n";
43 43
     echo "<input type=\"hidden\" name=\"userid\" value=\"$foo->userid\"
Please login to merge, or discard this patch.
html/ops/manage_user.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 
40 40
 // Delete a user if they have no credit, results, or posts
41 41
 //
42
-function possibly_delete_user($user){
43
-    if ($user->total_credit > 0.0){
42
+function possibly_delete_user($user) {
43
+    if ($user->total_credit > 0.0) {
44 44
         admin_error_page("Cannot delete user: User has credit.");
45 45
     }  
46 46
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         admin_error_page("Cannot delete user: User has forum posts.");
57 57
     }
58 58
 
59
-    if ($user->teamid){
59
+    if ($user->teamid) {
60 60
         user_quit_team($user);
61 61
     }
62 62
     delete_user($user);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
             // put a timestamp in wiki to trigger re-validation of credentials
102 102
 
103
-            if (function_exists('touch_wiki_user')){
103
+            if (function_exists('touch_wiki_user')) {
104 104
                 touch_wiki_user($user);  
105 105
             }
106 106
 
Please login to merge, or discard this patch.