Completed
Push — fixes_for_macos26 ( 179de4 )
by
unknown
52s queued 21s
created
html/user/forum_edit.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
 $post_owner = BoincUser::lookup_id($post->user);
44 44
 if (($logged_in_user->id != $post_owner->id) || (can_reply($thread, $forum, $logged_in_user) == false)) {
45
-    error_page (tra("You are not authorized to edit this post."));
45
+    error_page(tra("You are not authorized to edit this post."));
46 46
 }
47 47
 
48 48
 $thread_owner = BoincUser::lookup_id($thread->owner);
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 // (ie. not a response to another post)
52 52
 // allow the user to modify the thread title
53 53
 //
54
-$can_edit_title = ($post->parent_post==0 && $thread_owner->id==$logged_in_user->id && !is_banished($logged_in_user));
54
+$can_edit_title = ($post->parent_post == 0 && $thread_owner->id == $logged_in_user->id && !is_banished($logged_in_user));
55 55
 
56 56
 $content = post_str("content", true);
57 57
 $title = post_str("title", true);
58 58
 $preview = post_str("preview", true);
59 59
 
60
-if (post_str('submit',true) && (!$preview)) {
60
+if (post_str('submit', true) && (!$preview)) {
61 61
     if (POST_MAX_LINKS
62 62
         && link_count($content) > POST_MAX_LINKS
63 63
         && !is_moderator($logged_in_user, $forum)
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
     }
67 67
     check_tokens($logged_in_user->authenticator);
68 68
 
69
-    $add_signature = (post_str('add_signature', true) == "1")?1:0;
69
+    $add_signature = (post_str('add_signature', true) == "1") ? 1 : 0;
70 70
     $content = substr($content, 0, 64000);
71 71
     $content = trim($content);
72 72
     if (strlen($content)) {
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         $now = time();
75 75
         $post->update("signature=$add_signature, content='$content', modified=$now");
76 76
 
77
-        if ($can_edit_title){
77
+        if ($can_edit_title) {
78 78
             $title = trim($title);
79 79
             $title = sanitize_tags($title);
80 80
             $title = BoincDb::escape_string($title);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     }
88 88
 }
89 89
 
90
-page_head(tra("Edit post"),'','','', $bbcode_js);
90
+page_head(tra("Edit post"), '', '', '', $bbcode_js);
91 91
 
92 92
 switch ($forum->parent_type) {
93 93
 case 0:
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         sprintf(
123 123
             '<input type="text" size=%d name="title" value="%s">',
124 124
             80,
125
-            htmlspecialchars($preview?$title:$thread->title)
125
+            htmlspecialchars($preview ? $title : $thread->title)
126 126
         ),
127 127
         null, FORUM_LH_PCT
128 128
     );
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
         $bbcode_html,
140 140
         12,
141 141
         80,
142
-        htmlspecialchars($preview?$content:$post->content)
142
+        htmlspecialchars($preview ? $content : $post->content)
143 143
     ),
144 144
     null, FORUM_LH_PCT
145 145
 );
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
         '<input id="add_signature" name="add_signature" value="1" type="checkbox" %s>
150 150
         <label for="add_signature">%s</label>
151 151
         ',
152
-        $post->signature?'checked="true"':'',
152
+        $post->signature ? 'checked="true"' : '',
153 153
         tra("Add my signature to this post")
154 154
     ),
155 155
     null, FORUM_LH_PCT
Please login to merge, or discard this patch.
html/user/add_venue.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 $subset = sanitize_tags(get_str("subset"));
28 28
 $venue = sanitize_tags(get_str("venue"));
29 29
 $columns = get_int("cols", true);
30
-$c = $columns?"&cols=$columns":"";
30
+$c = $columns ? "&cols=$columns" : "";
31 31
 check_venue($venue);
32 32
 check_subset($subset);
33 33
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
             $title = tra("Edit %1 preferences", subset_name($subset));
43 43
             if ($venue) $title = "$title for $venue";
44 44
             page_head($title);
45
-            $x = $venue?"&venue=$venue":"";
45
+            $x = $venue ? "&venue=$venue" : "";
46 46
 
47 47
             echo PREFS_FORM_DESC1;
48 48
             echo PREFS_FORM_ERROR_DESC;
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
             $title = tra("Edit %1 preferences", subset_name($subset));
68 68
             if ($venue) $title = "$title for $venue";
69 69
             page_head($title);
70
-            $x = $venue?"&venue=$venue":"";
70
+            $x = $venue ? "&venue=$venue" : "";
71 71
 
72 72
             echo PREFS_FORM_ERROR_DESC;
73 73
 
Please login to merge, or discard this patch.
html/user/forum_index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
         project_forum_index_intro();
59 59
     }
60 60
 
61
-    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
61
+    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE) {
62 62
         $categories = BoincCategory::enum("true order by orderID");
63 63
     } else {
64 64
         echo "<p>"
Please login to merge, or discard this patch.
html/user/pm.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -84,20 +84,20 @@  discard block
 block discarded – undo
84 84
             if ($offset === false) $offset = 0;
85 85
             if ($offset >= $nmsgs) $offset = 0;
86 86
             echo sprintf('Showing messages %d to %d of %d',
87
-                $offset+1,
88
-                min($offset+$nshow, $nmsgs),
87
+                $offset + 1,
88
+                min($offset + $nshow, $nmsgs),
89 89
                 $nmsgs
90 90
             );
91 91
             if ($offset) {
92 92
                 echo sprintf(
93 93
                     ' &middot; <a href=pm.php?action=inbox&offset=%d>Previous %d</a>',
94
-                    max(0, $offset-$nshow), $nshow
94
+                    max(0, $offset - $nshow), $nshow
95 95
                 );
96 96
             }
97
-            if ($offset+$nshow < $nmsgs) {
97
+            if ($offset + $nshow < $nmsgs) {
98 98
                 echo sprintf(
99 99
                     ' &middot; <a href=pm.php?action=inbox&offset=%d>Next %d</a>',
100
-                    $offset+$nshow, $nshow
100
+                    $offset + $nshow, $nshow
101 101
                 );
102 102
             }
103 103
         }
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
112 112
             array('style="width: 12em;"', 'style="width: 10em;"', "")
113 113
         );
114 114
         $i = 0;
115
-        foreach($msgs as $msg) {
116
-            if ($i<$offset) {
115
+        foreach ($msgs as $msg) {
116
+            if ($i < $offset) {
117 117
                 $i++;
118 118
                 continue;
119 119
             }
120
-            if ($i>=$offset+$nshow) break;
120
+            if ($i >= $offset + $nshow) break;
121 121
             $i++;
122 122
             $sender = BoincUser::lookup_id($msg->senderid);
123 123
             if (!$sender) {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
     $msgs = BoincPrivateMessage::enum(
392 392
         "userid=$logged_in_user->id"
393 393
     );
394
-    foreach($msgs as $msg) {
394
+    foreach ($msgs as $msg) {
395 395
         $x = "pm_select_$msg->id";
396 396
         if (post_str($x, true)) {
397 397
             $msg = BoincPrivateMessage::lookup_id($msg->id);
Please login to merge, or discard this patch.
html/user/user_search.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     $y = [];
26 26
     $x[] = sprintf('%s%s',
27 27
         user_links($user, BADGE_HEIGHT_MEDIUM),
28
-        UNIQUE_USER_NAME?'':" (ID $user->id)"
28
+        UNIQUE_USER_NAME ? '' : " (ID $user->id)"
29 29
     );
30 30
     $y[] = null;
31 31
     if (!DISABLE_TEAMS) {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     $where = "true";
109 109
     $search_string = get_str('search_string');
110 110
     if (strlen($search_string)) {
111
-        if (strlen($search_string)<3) {
111
+        if (strlen($search_string) < 3) {
112 112
             error_page(tra("search string must be at least 3 characters"));
113 113
         }
114 114
         $s = BoincDb::escape_string($search_string);
@@ -140,17 +140,17 @@  discard block
 block discarded – undo
140 140
     $search_type = get_str('search_type', true);
141 141
     $order_clause = "id desc";
142 142
     if ($search_type == 'rac') {
143
-        $order_clause ="expavg_credit desc";
143
+        $order_clause = "expavg_credit desc";
144 144
     } else if ($search_type == 'total') {
145
-        $order_clause ="total_credit desc";
145
+        $order_clause = "total_credit desc";
146 146
     }
147 147
 
148 148
     $fields = "id, create_time, name, country, total_credit, expavg_credit, teamid, url, has_profile, donated";
149 149
     $users = BoincUser::enum_fields($fields, $where, "order by $order_clause limit 100");
150 150
     page_head(tra("User search results"));
151
-    $n=0;
151
+    $n = 0;
152 152
     foreach ($users as $user) {
153
-        if ($n==0) {
153
+        if ($n == 0) {
154 154
             start_table('table-striped');
155 155
             $x = ['Name'];
156 156
             $y = [null];
Please login to merge, or discard this patch.
html/user/forum_thread.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 $postid = get_int('postid', true);
31 31
 $filter = get_str('filter', true);
32 32
 
33
-if ($filter != "false"){
33
+if ($filter != "false") {
34 34
     $filter = true;
35 35
 } else {
36 36
     $filter = false;
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 if ($temp_sort_style) {
80 80
     $sort_style = $temp_sort_style;
81 81
 } else if ($sort_style) {
82
-    $forum_style = 0;   // this is deprecated
83
-    if ($logged_in_user){
82
+    $forum_style = 0; // this is deprecated
83
+    if ($logged_in_user) {
84 84
         $logged_in_user->prefs->thread_sorting = $sort_style;
85 85
         $logged_in_user->prefs->update("thread_sorting=$sort_style");
86 86
     } else {
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     );
93 93
 } else {
94 94
     // get the sorting style from the user or a cookie
95
-    if ($logged_in_user){
95
+    if ($logged_in_user) {
96 96
         $sort_style = $logged_in_user->prefs->thread_sorting;
97 97
     } else {
98 98
         list($forum_style, $sort_style) = parse_forum_cookie();
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
118 118
 
119 119
 if (false) {
120 120
 if ($forum->parent_type == 0) {
121
-    if ($category->is_helpdesk && !$thread->status){
122
-        if ($logged_in_user){
123
-            if ($thread->owner == $logged_in_user->id){
124
-                if ($thread->replies !=0) {
121
+    if ($category->is_helpdesk && !$thread->status) {
122
+        if ($logged_in_user) {
123
+            if ($thread->owner == $logged_in_user->id) {
124
+                if ($thread->replies != 0) {
125 125
                     // Show a "this question has been answered" to the author
126 126
                     echo "<p>";
127 127
                     show_button(
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
     // If logged in user is moderator, enable some extra features
190 190
     //
191 191
     if (is_moderator($logged_in_user, $forum)) {
192
-        if ($thread->hidden){
192
+        if ($thread->hidden) {
193 193
             show_button_small(
194 194
                 "forum_moderate_thread_action.php?action=unhide&amp;thread=".$thread->id."$tokens",
195 195
                 tra("Unhide"),
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
                 tra("Hide this thread")
203 203
             );
204 204
         }
205
-        if ($thread->sticky){
205
+        if ($thread->sticky) {
206 206
             show_button_small(
207 207
                 "forum_moderate_thread_action.php?action=desticky&amp;thread=".$thread->id."$tokens",
208 208
                 tra("Make unsticky"),
Please login to merge, or discard this patch.
html/user/user_permissions.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     start_table('table-striped');
28 28
 
29 29
     $x = ['User'];
30
-    for ($i=0; $i<S_NFLAGS; $i++) {
30
+    for ($i = 0; $i < S_NFLAGS; $i++) {
31 31
         $x[] = $special_user_bitfield[$i];
32 32
     }
33 33
     $x[] = '';
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
             $pref->userid
43 43
         );
44 44
         $x = ["$user->name ($user->id)"];
45
-        for ($j=0; $j<S_NFLAGS; $j++) {
45
+        for ($j = 0; $j < S_NFLAGS; $j++) {
46 46
             $bit = substr($pref->special_user, $j, 1);
47
-            $c = ($bit == 1)?"checked":"";
47
+            $c = ($bit == 1) ? "checked" : "";
48 48
             $x[] = sprintf(
49 49
                 '<input type="checkbox" name="role%d" value="1" %s>',
50 50
                 $j, $c
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
     echo '<form action="user_permissions.php" method="POST">';
59 59
     $x = ['Add User ID: <input type="text" name="userid" size="6">'];
60
-    for ($j=0; $j<S_NFLAGS; $j++) {
60
+    for ($j = 0; $j < S_NFLAGS; $j++) {
61 61
         $x[] = sprintf(
62 62
             '<input type="checkbox" name="role%d" value="1">',
63 63
             $j
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     if (!$user) error_page('no user');
78 78
     BoincForumPrefs::lookup($user);
79 79
 
80
-    for ($i=0; $i<S_NFLAGS; $i++) {
80
+    for ($i = 0; $i < S_NFLAGS; $i++) {
81 81
         if (post_int("role$i", true) == 1) {
82 82
             $bitset .= '1';
83 83
             echo "<br> setting $i";
Please login to merge, or discard this patch.
html/project.sample/project_specific_prefs.inc 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 //      Also error-check values, and return errors in $errors->*
34 34
 
35 35
 function option($name, $val) {
36
-    $x = ($name == $val) ?  "selected" : "";
36
+    $x = ($name == $val) ? "selected" : "";
37 37
     return "<option name='$name' $x>$name\n";
38 38
 }
39 39
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 if (APP_SELECT_PREFS) {
54 54
     $app_array = array();
55 55
     $apps = BoincApp::enum("deprecated=0");
56
-    foreach($apps as $app) {
56
+    foreach ($apps as $app) {
57 57
         $app_array[] = array($app->id, $app->user_friendly_name);
58 58
     }
59 59
 } else {
@@ -91,10 +91,10 @@  discard block
 block discarded – undo
91 91
 }
92 92
 
93 93
 function number_select($name, $max, $n) {
94
-    $sel = ($n == 0) ? "selected":"";
94
+    $sel = ($n == 0) ? "selected" : "";
95 95
     $x = "<select class=\"form-control input-sm\" name=$name> <option value=0 $sel>".tra("No limit")."</option>";
96
-    for ($i=1; $i<=$max; $i++) {
97
-        $sel = ($n == $i) ? "selected":"";
96
+    for ($i = 1; $i <= $max; $i++) {
97
+        $sel = ($n == $i) ? "selected" : "";
98 98
         $x .= "<option value=$i $sel>$i</option>";
99 99
     }
100 100
     $x .= "</select>";
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
     return tra("No limit");
107 107
 }
108 108
 
109
-function project_specific_prefs_edit($prefs, $error=false) {
109
+function project_specific_prefs_edit($prefs, $error = false) {
110 110
     global $app_array;
111 111
     if (COLOR_PREFS) {
112 112
         $x = $prefs->color_scheme;
@@ -132,15 +132,15 @@  discard block
 block discarded – undo
132 132
             } else {
133 133
                 $present = true;
134 134
             }
135
-            $checked = $present?"checked":"";
135
+            $checked = $present ? "checked" : "";
136 136
             $x .= "<input type=checkbox name=app_id_$app_id $checked> $app_name<br>";
137 137
         }
138 138
         tooltip_row2(APP_SELECT_TOOLTIP, APP_SELECT_DESC, $x);
139
-        $checked = $prefs->allow_non_preferred_apps?"checked":"";
139
+        $checked = $prefs->allow_non_preferred_apps ? "checked" : "";
140 140
         row2(ACCEPT_ANY_DESC, "<input type=checkbox name=allow_non_preferred_apps $checked>");
141 141
     }
142 142
     if (NON_GRAPHICAL_PREF) {
143
-        $checked = $prefs->non_graphical?"checked":"";
143
+        $checked = $prefs->non_graphical ? "checked" : "";
144 144
         row2(
145 145
             NON_GRAPHICAL_DESC,
146 146
             "<input type=checkbox name=non_graphical $checked>"
@@ -216,11 +216,11 @@  discard block
 block discarded – undo
216 216
     return $x;
217 217
 }
218 218
 
219
-function project_specific_prefs_show($prefs, $columns=false) {
219
+function project_specific_prefs_show($prefs, $columns = false) {
220 220
     global $app_array;
221 221
     if ($columns) {
222 222
         if (COLOR_PREFS) {
223
-            row_defs(COLOR_DESC,"color_scheme", "", "", $prefs);
223
+            row_defs(COLOR_DESC, "color_scheme", "", "", $prefs);
224 224
         }
225 225
         if (GFX_CPU_PREFS) {
226 226
             row_defs(MAX_GFX_CPU_PCT_DESC, "max_gfx_cpu_pct", "", "", $prefs);
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
             row2(ACCEPT_ANY_DESC, $prefs->allow_non_preferred_apps_text);
255 255
         }
256 256
         if (NON_GRAPHICAL_PREF) {
257
-            row2(NON_GRAPHICAL_DESC, $prefs->non_graphical?tra("yes"):tra("no"));
257
+            row2(NON_GRAPHICAL_DESC, $prefs->non_graphical ?tra("yes") : tra("no"));
258 258
         }
259 259
         if (MAX_JOBS_PREF) {
260 260
             row2(tra("Max # jobs"), limit_string($prefs->max_jobs));
@@ -277,12 +277,12 @@  discard block
 block discarded – undo
277 277
         $cursor = 0;
278 278
         while ($thisxml = parse_next_element($prefs_xml, "<app_id>", $cursor)) {
279 279
             if (is_numeric($thisxml)) {
280
-                $n = (int) $thisxml;
280
+                $n = (int)$thisxml;
281 281
                 $prefs->app_ids[] = $n;
282 282
             }
283 283
         }
284 284
         $prefs->allow_non_preferred_apps = parse_element($prefs_xml, "<allow_non_preferred_apps>");
285
-        $prefs->allow_non_preferred_apps_text = $prefs->allow_non_preferred_apps?"yes":"no";
285
+        $prefs->allow_non_preferred_apps_text = $prefs->allow_non_preferred_apps ? "yes" : "no";
286 286
     }
287 287
     if (NON_GRAPHICAL_PREF) {
288 288
         $prefs->non_graphical = parse_bool($prefs_xml, "non_graphical");
Please login to merge, or discard this patch.
html/inc/stats_sites.inc 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -147,11 +147,11 @@
 block discarded – undo
147 147
 
148 148
 function site_list($sites) {
149 149
     echo "<ul>\n";
150
-    for ($i=0; $i<count($sites); $i++) {
150
+    for ($i = 0; $i < count($sites); $i++) {
151 151
         $s = $sites[$i];
152 152
         $url = $s[0];
153 153
         $name = $s[1];
154
-        $comment = array_key_exists(2, $s)?$s[2]:"";
154
+        $comment = array_key_exists(2, $s) ? $s[2] : "";
155 155
         echo "<li><a href=\"$url\">$name</a> $comment\n";
156 156
     }
157 157
     echo "</ul>\n";
Please login to merge, or discard this patch.