Completed
Push — fixes_for_macos26 ( 179de4 )
by
unknown
52s queued 21s
created
html/inc/team.inc 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
41 41
     row2(
42 42
         tra('Key words').'<br><small>'.tra('Find teams with these words in their names or descriptions').'</small>',
43
-        '<input class="form-control" type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
43
+        '<input class="form-control" type="text" name="keywords" value="'.htmlspecialchars($params->keywords).'">');
44 44
     row2_init(tra('Country'));
45 45
     echo '<select class="form-control" name="country"><option value="" selected>---</option>';
46 46
     $country = $params->country;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     echo country_select_options($country);
49 49
     echo "</select></td></tr>\n";
50 50
     row2(tra('Type of team'), team_type_select($params->type, true));
51
-    $checked = $params->active?"checked":"";
51
+    $checked = $params->active ? "checked" : "";
52 52
     row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
53 53
     row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
54 54
     end_table();
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     row2("Created", date_str($team->create_time));
96 96
     if (defined("SHOW_NONVALIDATED_TEAMS")) {
97 97
         $founder = $team->founder;
98
-        row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
98
+        row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)");
99 99
     }
100 100
     if (strlen($team->url)) {;
101 101
         if (strstr($team->url, "http://")) {
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
     }
169 169
     row1(tra('Members'));
170 170
     row2(tra('Founder'),
171
-        $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
171
+        $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---"
172 172
     );
173 173
     if (count($team->admins)) {
174 174
         $first = true;
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
     foreach ($deltas as $delta) {
356 356
         $u = BoincUser::lookup_id($delta->userid);
357 357
         if ($u->teamid == $teamid) {
358
-            $new_members[] = $u->id;  // they might have later quit
358
+            $new_members[] = $u->id; // they might have later quit
359 359
         }
360 360
     }
361 361
     return array_unique($new_members);
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
     if (!$user->teamid) return;
439 439
     $user->update("teamid=0");
440 440
     $team = BoincTeam::lookup_id($user->teamid);
441
-    if ($team && $team->ping_user==$user->id) {
441
+    if ($team && $team->ping_user == $user->id) {
442 442
         $team->update("ping_user=-ping_user");
443 443
     }
444 444
     BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id");
@@ -477,33 +477,33 @@  discard block
 block discarded – undo
477 477
     start_table();
478 478
     row2(tra('Team name, text version').'
479 479
         <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
480
-        '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">'
480
+        '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">'
481 481
     );
482 482
     row2(tra('Team name, HTML version').'
483 483
         <br><p class=\"text-muted\">
484 484
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
485 485
         '.tra('If you don\'t know HTML, leave this box blank.').'</p>',
486
-        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">'
486
+        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">'
487 487
     );
488 488
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
489 489
         '.tra('This URL will be linked to from the team\'s page on this site.'),
490
-        '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">'
490
+        '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">'
491 491
     );
492 492
     row2(tra('Description of team').':
493 493
         <br><p class=\"text-muted\">
494 494
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
495 495
         </p>',
496
-        '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>'
496
+        '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>'
497 497
     );
498 498
 
499
-    row2(tra('Type of team').':', team_type_select($team?$team->type:null));
499
+    row2(tra('Type of team').':', team_type_select($team ? $team->type : null));
500 500
 
501 501
     row2_init(tra('Country'));
502 502
     echo '<select class="form-control" name="country">';
503
-    echo country_select_options($team?$team->country:null);
503
+    echo country_select_options($team ? $team->country : null);
504 504
     echo "</select></td></tr>\n";
505 505
 
506
-    $x = (!$team || $team->joinable)?"checked":"";
506
+    $x = (!$team || $team->joinable) ? "checked" : "";
507 507
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
508 508
     // Check if we're using reCaptcha to prevent spam accounts
509 509
     //
@@ -571,12 +571,12 @@  discard block
 block discarded – undo
571 571
 //
572 572
 function new_transfer_request_ok($team, $now) {
573 573
     if ($team->ping_user <= 0) {
574
-        if ($team->ping_time < $now - 60 * 86400) {
574
+        if ($team->ping_time < $now - 60*86400) {
575 575
             return true;
576 576
         }
577 577
         return false;
578 578
     }
579
-    if ($team->ping_time < $now - 90 * 86400) {
579
+    if ($team->ping_time < $now - 90*86400) {
580 580
         return true;
581 581
     }
582 582
     return false;
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
     if (!is_valid_country($country)) {
612 612
         $country = tra('None');
613 613
     }
614
-    $country = BoincDb::escape_string($country);  // for Cote d'Ivoire
614
+    $country = BoincDb::escape_string($country); // for Cote d'Ivoire
615 615
 
616 616
     $clause = sprintf(
617 617
         "(userid, create_time, name, name_lc, url, type, name_html, description, country, nusers, expavg_time) values(%d, %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, unix_timestamp())",
Please login to merge, or discard this patch.
html/inc/profile.inc 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
     if (!$user->has_profile) return null;
72 72
     $profile = BoincProfile::lookup("userid=$user->id");
73 73
     if (!$profile->has_picture) return null;
74
-    if (profile_screening() && $profile->verification!=1) return null;
74
+    if (profile_screening() && $profile->verification != 1) return null;
75 75
     return profile_thumb_url($user->id);
76 76
 }
77 77
 
@@ -125,11 +125,11 @@  discard block
 block discarded – undo
125 125
         return $image;
126 126
     }
127 127
 
128
-    ($origWidth > $origHeight)? $scalar = ($origWidth / $targetWidth) : $scalar = ($origHeight / $targetHeight);
128
+    ($origWidth > $origHeight) ? $scalar = ($origWidth/$targetWidth) : $scalar = ($origHeight/$targetHeight);
129 129
 
130 130
     if ($scalar != 0) {
131
-        $destWidth = $origWidth / $scalar;
132
-        $destHeight = $origHeight / $scalar;
131
+        $destWidth = $origWidth/$scalar;
132
+        $destHeight = $origHeight/$scalar;
133 133
     } else {
134 134
         $destWidth = $origWidth;
135 135
         $destHeight = $origHeight;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
     $gd_info = gd_info();
139 139
     $v = $gd_info["GD Version"];
140 140
     $v = explode('.', $v);
141
-    $v = (int)$v[0];        // major version
141
+    $v = (int)$v[0]; // major version
142 142
     if ($v >= 2) {
143 143
         // If you are using a modern PHP/GD installation that does
144 144
         // 'truecolor' images, this is what's needed.
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
         $options->htmlitems = false;
182 182
         $temp = output_transform($profile->response1, $options);
183 183
         $temp = sanitize_tags($temp);
184
-        $description = "(\"" . sub_sentence($temp, ' ', MAX_DESC_LENGTH, true) . "\")";
184
+        $description = "(\"".sub_sentence($temp, ' ', MAX_DESC_LENGTH, true)."\")";
185 185
 
186 186
     }
187 187
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
 function check_whether_to_show_profile($user, $logged_in_user) {
193 193
     $min_credit = parse_config(get_config(), "<profile_min_credit>");
194
-    if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) {
194
+    if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit) {
195 195
         error_page(
196 196
            tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
197 197
         );
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
     //
230 230
     $show_picture = $profile->has_picture;
231 231
     if (profile_screening()) {
232
-        if (!$screen_mode && !$can_edit && $profile->verification!=1) {
232
+        if (!$screen_mode && !$can_edit && $profile->verification != 1) {
233 233
             $show_picture = false;
234 234
         }
235 235
     }
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
     // yet verified.  This will tell them if other users can't view it yet, or
246 246
     // if there is a problem with it and they need to replace it.
247 247
     //
248
-    if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification!=1) {
248
+    if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification != 1) {
249 249
         row1(offensive_profile_warning($profile->verification));
250 250
     }
251 251
 
Please login to merge, or discard this patch.
html/ops/sample_table_stats.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,25 +27,25 @@
 block discarded – undo
27 27
     row_array(array("Name", "Engine", "Version", "Row Format", "Rows", "Avg Row Length (KB)", "Data Length (MB)", "Max Data Length (MB)", "Index Length (MB)", "Data free (MB)", "Create Time", "Update Time", "Check Time", "Create Options", "Comment"));
28 28
     db_init();
29 29
     $result = _mysql_query("show table status");
30
-    while($row = _mysql_fetch_array($result)) {
30
+    while ($row = _mysql_fetch_array($result)) {
31 31
         $size += ($row["Data_length"] + $row["Index_length"]);
32 32
         $engine = $row["Engine"];
33 33
         //if (!$engine) $engine = $row["Type"];
34 34
         row_array(array(
35 35
             $row["Name"],
36 36
             $engine,
37
-            $row["Version"] ,
38
-            $row["Row_format"] ,
39
-            $row["Rows"] ,
40
-            round($row["Avg_row_length"]/1024,2) ,
41
-            round($row["Data_length"]/(1024*1024),2) ,
42
-            round($row["Max_data_length"]/(1024*1024),2) ,
43
-            round($row["Index_length"]/(1024*1024),2) ,
44
-            round($row["Data_free"]/(1024*1024),2) ,
45
-            $row["Create_time"] ,
46
-            $row["Update_time"] ,
47
-            $row["Check_time"] ,
48
-            $row["Create_options"] ,
37
+            $row["Version"],
38
+            $row["Row_format"],
39
+            $row["Rows"],
40
+            round($row["Avg_row_length"]/1024, 2),
41
+            round($row["Data_length"]/(1024*1024), 2),
42
+            round($row["Max_data_length"]/(1024*1024), 2),
43
+            round($row["Index_length"]/(1024*1024), 2),
44
+            round($row["Data_free"]/(1024*1024), 2),
45
+            $row["Create_time"],
46
+            $row["Update_time"],
47
+            $row["Check_time"],
48
+            $row["Create_options"],
49 49
             $row["Comment"]
50 50
         ));
51 51
     }
Please login to merge, or discard this patch.
html/inc/consent.inc 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 require_once("../inc/boinc_db.inc");
22 22
 require_once("../inc/util.inc");
23 23
 
24
-define('CONSENT_TYPE_ENROLL','ENROLL');
24
+define('CONSENT_TYPE_ENROLL', 'ENROLL');
25 25
 
26 26
 function check_termsofuse() {
27 27
     return defined('TERMSOFUSE_FILE') and file_exists(TERMSOFUSE_FILE);
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
     $source, $ctime = 0
33 33
 ) {
34 34
     $mys = BoincDb::escape_string($source);
35
-    if ($ctime==0) {
35
+    if ($ctime == 0) {
36 36
         $mytime = $user->create_time;
37 37
     } else {
38 38
         $mytime = $ctime;
39 39
     }
40 40
     return BoincConsent::insert(
41
-        "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) " .
41
+        "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) ".
42 42
         "values($user->id, $consent_type_id, $mytime, $consent_flag, $consent_not_required, '$mys')"
43 43
     );
44 44
 
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
65 65
 // The integer is the consent_type_id- the id from consent_type table.
66 66
 // If the boolean is FALSE, the integer returned is -1.
67 67
 //
68
-function check_consent_type($name, $checkenabled=TRUE) {
68
+function check_consent_type($name, $checkenabled = TRUE) {
69 69
     $name = BoincDb::escape_string($name);
70 70
     $ct = BoincConsentType::lookup("shortname = '$name'");
71
-    if ($ct and ( !$checkenabled or ($ct->enabled)) ) {
71
+    if ($ct and (!$checkenabled or ($ct->enabled))) {
72 72
         return array(TRUE, $ct->id);
73 73
     }
74 74
     return array(FALSE, -1);
Please login to merge, or discard this patch.
html/user/openid_login.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 // You should have received a copy of the GNU Lesser General Public License
17 17
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
18 18
 
19
-NOT FINISHED.   DON'T USE
19
+NOT FINISHED.DON'T USE
20 20
 
21 21
 require 'openid.php';
22 22
 include_once("../inc/boinc_db.inc");
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 
27 27
 function show_error($str) {
28 28
     page_head("Can't create account");
29
-    echo "$str<br>\n";
29
+    echo "$str < br > \n";
30 30
     page_tail();
31 31
     exit();
32 32
 }
33 33
 
34 34
 try {
35 35
     $openid = new LightOpenID;
36
-    echo "<pre>";
36
+    echo " < pre > ";
37 37
     if(!$openid->mode) {
38 38
         if(isset($_POST['openid_identifier'])) {
39 39
             $openid->identity = $_POST['openid_identifier'];
Please login to merge, or discard this patch.
html/user/prefs_edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 $subset = sanitize_tags(get_str("subset"));
28 28
 $venue = sanitize_tags(get_str("venue", true));
29 29
 $columns = get_int("cols", true);
30
-$c = $columns?"&cols=$columns":"";
30
+$c = $columns ? "&cols=$columns" : "";
31 31
 check_subset($subset);
32 32
 if ($action) {
33 33
     check_tokens($user->authenticator);
Please login to merge, or discard this patch.
html/inc/util_basic.inc 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
     return file_exists("$d/stop_sched");
57 57
 }
58 58
 
59
-function xml_error($num=-1, $msg=null, $file=null, $line=null) {
59
+function xml_error($num = -1, $msg = null, $file = null, $line = null) {
60 60
     global $xml_outer_tag;
61 61
     if (!$msg) {
62
-        switch($num) {
62
+        switch ($num) {
63 63
         case -112: $msg = "Invalid XML"; break;
64 64
         case -136: $msg = "Not found"; break;
65 65
         case -137: $msg = "Name or email address is not unique"; break;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 // If it's a single-tag element, and it's present, just return the tag
106 106
 //
107 107
 function parse_element($xml, $tag) {
108
-    $closetag = "</" . substr($tag,1);
108
+    $closetag = "</".substr($tag, 1);
109 109
     $x = strstr($xml, $tag);
110 110
     if ($x) {
111 111
         if (strstr($tag, "/>")) return $tag;
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
 
122 122
 function parse_next_element($xml, $tag, &$cursor) {
123 123
     $element = null;
124
-    $closetag = "</" . substr($tag,1);
125
-    $pos = substr($xml,$cursor);
124
+    $closetag = "</".substr($tag, 1);
125
+    $pos = substr($xml, $cursor);
126 126
     $x = strstr($pos, $tag);
127 127
     if ($x) {
128 128
         if (strstr($tag, "/>")) return $tag;
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 // whose OSs may have such restrictions.
223 223
 //
224 224
 function is_valid_filename($x) {
225
-    if (strlen($x)>255) return false;
225
+    if (strlen($x) > 255) return false;
226 226
     // \w means A-Za-z0-9_
227 227
     return preg_match('/^[\w\-.]+$/', $x);
228 228
 }
Please login to merge, or discard this patch.
html/user/forum_post.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
     error_page("Forums are disabled");
44 44
 }
45 45
 
46
-if (user_can_create_thread($logged_in_user, $forum)=='no') {
46
+if (user_can_create_thread($logged_in_user, $forum) == 'no') {
47 47
     error_page(tra("Only project admins may create a thread here. However, you may reply to existing threads."));
48 48
 }
49 49
 check_post_access($logged_in_user, $forum);
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
 $preview = post_str("preview", true);
57 57
 $warning = null;
58 58
 
59
-if ($content && $title && (!$preview)){
59
+if ($content && $title && (!$preview)) {
60 60
     if (post_str('add_signature', true)) {
61
-        $add_signature = true;    // set a flag and concatenate later
62
-    }  else {
61
+        $add_signature = true; // set a flag and concatenate later
62
+    } else {
63 63
         $add_signature = false;
64 64
     }
65 65
     check_tokens($logged_in_user->authenticator);
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
             if (post_str('subscribe', true)) {
75 75
                 BoincSubscription::replace($logged_in_user->id, $thread->id);
76 76
             }
77
-            header('Location: forum_thread.php?id=' . $thread->id);
77
+            header('Location: forum_thread.php?id='.$thread->id);
78 78
         } else {
79 79
             error_page("Can't create thread.  $forum_error");
80 80
         }
81 81
     }
82 82
 }
83 83
 
84
-page_head(tra("Create new thread"),'','','', $bbcode_js);
84
+page_head(tra("Create new thread"), '', '', '', $bbcode_js);
85 85
 show_forum_header($logged_in_user);
86 86
 
87 87
 if ($warning) {
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
     $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>";
123 123
 }
124 124
 
125
-if ($force_title && $title){
125
+if ($force_title && $title) {
126 126
     row2(
127 127
         tra("Title"),
128 128
         sprintf(
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
     row2(
137 137
         tra("Title").$submit_help,
138 138
         sprintf('<input type="text" class="form-control" name="title" value="%s">',
139
-            $title?htmlspecialchars($title):''
139
+            $title ?htmlspecialchars($title) : ''
140 140
         ),
141 141
         null, FORUM_LH_PCT
142 142
     );
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     sprintf(
148 148
         '%s <textarea class="form-control" name="content" rows="12" cols="80">%s</textarea>',
149 149
         $bbcode_html,
150
-        $content?htmlspecialchars($content):''
150
+        $content ?htmlspecialchars($content) : ''
151 151
     ),
152 152
     null, FORUM_LH_PCT
153 153
 );
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 if (!$logged_in_user->prefs->no_signature_by_default) {
156 156
     $enable_signature = 'checked="true"';
157 157
 } else {
158
-    $enable_signature='';
158
+    $enable_signature = '';
159 159
 }
160 160
 
161 161
 if (is_news_forum($forum)) {
Please login to merge, or discard this patch.
html/user/forum_user_posts.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 $user = BoincUser::lookup_id($userid);
30 30
 if (!$user) error_page('no such user');
31 31
 $offset = get_int("offset", true);
32
-if (!$offset) $offset=0;
32
+if (!$offset) $offset = 0;
33 33
 $items_per_page = 20;
34 34
 
35 35
 $logged_in_user = get_logged_in_user(false);
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 		break;
115 115
 	}
116 116
     if ($n >= $offset) {
117
-        show_post_and_context($post, $thread, $forum, $options, $n+1);
117
+        show_post_and_context($post, $thread, $forum, $options, $n + 1);
118 118
     }
119 119
     $n++;
120 120
 }
Please login to merge, or discard this patch.