Passed
Push — vko_update_linux_packaging_tes... ( 3a8101...b29608 )
by Vitalii
09:28
created
html/user/edit_forum_preferences_action.php 2 patches
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 }
30 30
 BoincForumPrefs::lookup($user);
31 31
 
32
-if (post_str("action", true)=="reset_confirm"){
32
+if (post_str("action", true) == "reset_confirm") {
33 33
     page_head(tra("Confirm reset"));
34 34
     echo tra("This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button.")."
35 35
         <p>
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 // If the user has requested a reset of preferences;
46 46
 // preserve a few fields.
47 47
 //
48
-if (post_str("action", true)=="reset"){
48
+if (post_str("action", true) == "reset") {
49 49
     $posts = $user->prefs->posts;
50 50
     $last_post = $user->prefs->last_post;
51 51
     $rated_posts = $user->prefs->rated_posts;
@@ -67,30 +67,30 @@  discard block
 block discarded – undo
67 67
 if (!DISABLE_FORUMS) {
68 68
 
69 69
 $avatar_type = post_int("avatar_select");
70
-$newfile=IMAGE_PATH.$user->id."_avatar.jpg";
70
+$newfile = IMAGE_PATH.$user->id."_avatar.jpg";
71 71
 
72 72
 // Update the user avatar
73
-if ($avatar_type<0 or $avatar_type>3) $avatar_type=0;
74
-if ($avatar_type==0){
75
-    if (file_exists($newfile)){
73
+if ($avatar_type < 0 or $avatar_type > 3) $avatar_type = 0;
74
+if ($avatar_type == 0) {
75
+    if (file_exists($newfile)) {
76 76
         // Delete the file on the server if the user
77 77
         // decides not to use an avatar
78 78
         //
79 79
         unlink($newfile);
80 80
     }
81
-    $avatar_url="";
81
+    $avatar_url = "";
82 82
 } elseif ($avatar_type == 1) {
83 83
     $avatar_url = "//www.gravatar.com/avatar/".md5($user->email_addr)."?s=100&amp;d=identicon";
84
-} elseif ($avatar_type==2){
85
-    if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name']!="")) {
86
-        if ($_FILES['picture']['tmp_name']!="") {
84
+} elseif ($avatar_type == 2) {
85
+    if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name'] != "")) {
86
+        if ($_FILES['picture']['tmp_name'] != "") {
87 87
             $file = $_FILES['picture']['tmp_name'];
88 88
         } else {
89 89
             // Remote image. Download and store locally
90 90
             $file = post_str("avatar_url");
91 91
         }
92 92
         $size = getImageSize($file);
93
-        if ($size[2]!=2 and $size[2]!=3){
93
+        if ($size[2] != 2 and $size[2] != 3) {
94 94
             //Not the right kind of file
95 95
             error_page(tra("Error: Not the right kind of file, only PNG and JPEG are supported."));
96 96
         }
@@ -99,30 +99,30 @@  discard block
 block discarded – undo
99 99
         $image2 = intelligently_scale_image($file, 100, 100);
100 100
         ImageJPEG($image2, $newfile);
101 101
     }
102
-    if (file_exists($newfile)){
103
-        $avatar_url=IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
102
+    if (file_exists($newfile)) {
103
+        $avatar_url = IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
104 104
     } else {
105 105
         //User didn't upload a compatible file or it went lost on the server
106
-        $avatar_url="";
106
+        $avatar_url = "";
107 107
     }
108 108
 }
109 109
 
110
-$images_as_links = (isset($_POST["forum_images_as_links"]) && $_POST["forum_images_as_links"]!="")?1:0;
111
-$link_popup = (isset($_POST["forum_link_popup"]) && $_POST["forum_link_popup"]!="")?1:0;
112
-$hide_avatars = (isset($_POST["forum_hide_avatars"]) && $_POST["forum_hide_avatars"]!="")?1:0;
113
-$hide_signatures = (isset($_POST["forum_hide_signatures"]) && $_POST["forum_hide_signatures"]!="")?1:0;
114
-$highlight_special = (isset($_POST["forum_highlight_special"]) && $_POST["forum_highlight_special"]!="")?1:0;
115
-$jump_to_unread = (isset($_POST["forum_jump_to_unread"]) && $_POST["forum_jump_to_unread"]!="")?1:0;
116
-$ignore_sticky_posts = (isset($_POST["forum_ignore_sticky_posts"]) && $_POST["forum_ignore_sticky_posts"]!="")?1:0;
117
-$no_signature_by_default = (isset($_POST["signature_by_default"]) && $_POST["signature_by_default"]!="")?0:1;
110
+$images_as_links = (isset($_POST["forum_images_as_links"]) && $_POST["forum_images_as_links"] != "") ? 1 : 0;
111
+$link_popup = (isset($_POST["forum_link_popup"]) && $_POST["forum_link_popup"] != "") ? 1 : 0;
112
+$hide_avatars = (isset($_POST["forum_hide_avatars"]) && $_POST["forum_hide_avatars"] != "") ? 1 : 0;
113
+$hide_signatures = (isset($_POST["forum_hide_signatures"]) && $_POST["forum_hide_signatures"] != "") ? 1 : 0;
114
+$highlight_special = (isset($_POST["forum_highlight_special"]) && $_POST["forum_highlight_special"] != "") ? 1 : 0;
115
+$jump_to_unread = (isset($_POST["forum_jump_to_unread"]) && $_POST["forum_jump_to_unread"] != "") ? 1 : 0;
116
+$ignore_sticky_posts = (isset($_POST["forum_ignore_sticky_posts"]) && $_POST["forum_ignore_sticky_posts"] != "") ? 1 : 0;
117
+$no_signature_by_default = (isset($_POST["signature_by_default"]) && $_POST["signature_by_default"] != "") ? 0 : 1;
118 118
 $signature = post_str("signature", true);
119
-if (strlen($signature)>250) {
119
+if (strlen($signature) > 250) {
120 120
     error_page(tra("Your signature was too long, please keep it less than 250 characters."));
121 121
 }
122 122
 $forum_sort = post_int("forum_sort");
123 123
 $thread_sort = post_int("thread_sort");
124 124
 $display_wrap_postcount = post_int("forum_display_wrap_postcount");
125
-if ($display_wrap_postcount<1) $display_wrap_postcount=1;
125
+if ($display_wrap_postcount < 1) $display_wrap_postcount = 1;
126 126
 
127 127
 $signature = BoincDb::escape_string($signature);
128 128
 
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
141 141
     }
142 142
 } else {
143 143
     // todo: clean up the following
144
-    $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"]!="");
145
-    if ($add_user_to_filter){
144
+    $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"] != "");
145
+    if ($add_user_to_filter) {
146 146
         $user_to_add = trim($_POST["forum_filter_user"]);
147
-        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))){
147
+        if ($user_to_add != "" and $user_to_add == strval(intval($user_to_add))) {
148 148
             $other_user = BoincUser::lookup_id($user_to_add);
149 149
             if (!$other_user) {
150 150
                 echo tra("No such user:")." ".$user_to_add;
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
 //
160 160
 $ignored_users = get_ignored_list($user);
161 161
 // todo: use foreach
162
-for ($i=0;$i<sizeof($ignored_users);$i++){
162
+for ($i = 0; $i < sizeof($ignored_users); $i++) {
163 163
     $remove = "remove".trim($ignored_users[$i]);
164
-    if (isset($_POST[$remove]) && $_POST[$remove]!=""){
164
+    if (isset($_POST[$remove]) && $_POST[$remove] != "") {
165 165
         $other_user = BoincUser::lookup_id($ignored_users[$i]);
166 166
         if (!$other_user) {
167 167
             echo tra("No such user:")." ".$ignored_users[$j];
Please login to merge, or discard this patch.
Braces   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 }
30 30
 BoincForumPrefs::lookup($user);
31 31
 
32
-if (post_str("action", true)=="reset_confirm"){
32
+if (post_str("action", true)=="reset_confirm") {
33 33
     page_head(tra("Confirm reset"));
34 34
     echo tra("This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button.")."
35 35
         <p>
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 // If the user has requested a reset of preferences;
46 46
 // preserve a few fields.
47 47
 //
48
-if (post_str("action", true)=="reset"){
48
+if (post_str("action", true)=="reset") {
49 49
     $posts = $user->prefs->posts;
50 50
     $last_post = $user->prefs->last_post;
51 51
     $rated_posts = $user->prefs->rated_posts;
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
 
72 72
 // Update the user avatar
73 73
 if ($avatar_type<0 or $avatar_type>3) $avatar_type=0;
74
-if ($avatar_type==0){
75
-    if (file_exists($newfile)){
74
+if ($avatar_type==0) {
75
+    if (file_exists($newfile)) {
76 76
         // Delete the file on the server if the user
77 77
         // decides not to use an avatar
78 78
         //
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
     $avatar_url="";
82 82
 } elseif ($avatar_type == 1) {
83 83
     $avatar_url = "//www.gravatar.com/avatar/".md5($user->email_addr)."?s=100&amp;d=identicon";
84
-} elseif ($avatar_type==2){
84
+} elseif ($avatar_type==2) {
85 85
     if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name']!="")) {
86 86
         if ($_FILES['picture']['tmp_name']!="") {
87 87
             $file = $_FILES['picture']['tmp_name'];
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
             $file = post_str("avatar_url");
91 91
         }
92 92
         $size = getImageSize($file);
93
-        if ($size[2]!=2 and $size[2]!=3){
93
+        if ($size[2]!=2 and $size[2]!=3) {
94 94
             //Not the right kind of file
95 95
             error_page(tra("Error: Not the right kind of file, only PNG and JPEG are supported."));
96 96
         }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         $image2 = intelligently_scale_image($file, 100, 100);
100 100
         ImageJPEG($image2, $newfile);
101 101
     }
102
-    if (file_exists($newfile)){
102
+    if (file_exists($newfile)) {
103 103
         $avatar_url=IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
104 104
     } else {
105 105
         //User didn't upload a compatible file or it went lost on the server
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
 } else {
143 143
     // todo: clean up the following
144 144
     $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"]!="");
145
-    if ($add_user_to_filter){
145
+    if ($add_user_to_filter) {
146 146
         $user_to_add = trim($_POST["forum_filter_user"]);
147
-        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))){
147
+        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))) {
148 148
             $other_user = BoincUser::lookup_id($user_to_add);
149 149
             if (!$other_user) {
150 150
                 echo tra("No such user:")." ".$user_to_add;
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
 //
160 160
 $ignored_users = get_ignored_list($user);
161 161
 // todo: use foreach
162
-for ($i=0;$i<sizeof($ignored_users);$i++){
162
+for ($i=0;$i<sizeof($ignored_users);$i++) {
163 163
     $remove = "remove".trim($ignored_users[$i]);
164
-    if (isset($_POST[$remove]) && $_POST[$remove]!=""){
164
+    if (isset($_POST[$remove]) && $_POST[$remove]!="") {
165 165
         $other_user = BoincUser::lookup_id($ignored_users[$i]);
166 166
         if (!$other_user) {
167 167
             echo tra("No such user:")." ".$ignored_users[$j];
Please login to merge, or discard this patch.
html/user/edit_forum_preferences_form.php 2 patches
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,8 +53,9 @@  discard block
 block discarded – undo
53 53
 // ------------ Forum identity -----------
54 54
 
55 55
 $select_0 = $select_1 = $select_2 = "";
56
-if (strlen($user->prefs->avatar)){
57
-    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar
56
+if (strlen($user->prefs->avatar)) {
57
+    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") {
58
+// Gravatar
58 59
         $select_1 = "checked=\"true\"";
59 60
     } else {
60 61
         $select_2 = "checked=\"true\"";
@@ -73,7 +74,7 @@  discard block
 block discarded – undo
73 74
     <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2.">
74 75
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
75 76
 );
76
-if (strlen($user->prefs->avatar)){
77
+if (strlen($user->prefs->avatar)) {
77 78
     row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
78 79
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
79 80
 }
@@ -103,7 +104,7 @@  discard block
 block discarded – undo
103 104
         tra("Attach signature by default")
104 105
     )
105 106
 );
106
-if ($user->prefs->signature!=""){
107
+if ($user->prefs->signature!="") {
107 108
     row2(tra("Signature preview").
108 109
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
109 110
         output_transform($user->prefs->signature)
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 // ------------ Notification -----------
39 39
 
40 40
 row1(tra("Notifications"));
41
-$ch0 = $user->prefs->pm_notification==0?"checked":"";
42
-$ch1 = $user->prefs->pm_notification==1?"checked":"";
43
-$ch2 = $user->prefs->pm_notification==2?"checked":"";
41
+$ch0 = $user->prefs->pm_notification == 0 ? "checked" : "";
42
+$ch1 = $user->prefs->pm_notification == 1 ? "checked" : "";
43
+$ch2 = $user->prefs->pm_notification == 2 ? "checked" : "";
44 44
 row2(
45 45
     tra("How should we notify you of new private messages, friend requests, posts in subscribed threads, and other events?"),
46 46
     "<input type=radio name=pm_notification value=0 $ch0> ".tra("On my Account page (no email)")."
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 // ------------ Forum identity -----------
54 54
 
55 55
 $select_0 = $select_1 = $select_2 = "";
56
-if (strlen($user->prefs->avatar)){
57
-    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar
56
+if (strlen($user->prefs->avatar)) {
57
+    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18) == "//www.gravatar.com") { // Gravatar
58 58
         $select_1 = "checked=\"true\"";
59 59
     } else {
60 60
         $select_2 = "checked=\"true\"";
@@ -73,15 +73,15 @@  discard block
 block discarded – undo
73 73
     <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2.">
74 74
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
75 75
 );
76
-if (strlen($user->prefs->avatar)){
76
+if (strlen($user->prefs->avatar)) {
77 77
     row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
78 78
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
79 79
 }
80 80
 
81
-$signature_by_default = $user->prefs->no_signature_by_default==false?"checked=\"checked\"":"";
81
+$signature_by_default = $user->prefs->no_signature_by_default == false ? "checked=\"checked\"" : "";
82 82
 
83
-$signature=$user->prefs->signature;
84
-$maxlen=250;
83
+$signature = $user->prefs->signature;
84
+$maxlen = 250;
85 85
 $x = '';
86 86
 if (!NO_COMPUTING) {
87 87
     $x = tra(
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         tra("Attach signature by default")
104 104
     )
105 105
 );
106
-if ($user->prefs->signature!=""){
106
+if ($user->prefs->signature != "") {
107 107
     row2(tra("Signature preview").
108 108
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
109 109
         output_transform($user->prefs->signature)
@@ -112,13 +112,13 @@  discard block
 block discarded – undo
112 112
 
113 113
 // ------------ Message display  -----------
114 114
 
115
-$forum_hide_avatars = $user->prefs->hide_avatars?"checked=\"checked\"":"";
116
-$forum_hide_signatures = $user->prefs->hide_signatures?"checked=\"checked\"":"";
117
-$forum_link_popup = $user->prefs->link_popup?"checked=\"checked\"":"";
118
-$forum_image_as_link = $user->prefs->images_as_links?"checked=\"checked\"":"";
119
-$forum_jump_to_unread = $user->prefs->jump_to_unread?"checked=\"checked\"":"";
120
-$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts?"checked=\"checked\"":"";
121
-$forum_highlight_special = $user->prefs->highlight_special?"checked=\"checked\"":"";
115
+$forum_hide_avatars = $user->prefs->hide_avatars ? "checked=\"checked\"" : "";
116
+$forum_hide_signatures = $user->prefs->hide_signatures ? "checked=\"checked\"" : "";
117
+$forum_link_popup = $user->prefs->link_popup ? "checked=\"checked\"" : "";
118
+$forum_image_as_link = $user->prefs->images_as_links ? "checked=\"checked\"" : "";
119
+$forum_jump_to_unread = $user->prefs->jump_to_unread ? "checked=\"checked\"" : "";
120
+$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts ? "checked=\"checked\"" : "";
121
+$forum_highlight_special = $user->prefs->highlight_special ? "checked=\"checked\"" : "";
122 122
 
123 123
 $forum_minimum_wrap_postcount = intval($user->prefs->minimum_wrap_postcount);
124 124
 $forum_display_wrap_postcount = intval($user->prefs->display_wrap_postcount);
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
                 <input class="btn btn-default" type="submit" name="remove%d" value="%s">
165 165
                 <br>
166 166
             ',
167
-            UNIQUE_USER_NAME?'':"$blocked_user->id -",
167
+            UNIQUE_USER_NAME ? '' : "$blocked_user->id -",
168 168
             user_links($blocked_user),
169 169
             $blocked_user->id,
170 170
             tra("Unblock")
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         tra("Blocked users"),
179 179
         tra('Ignore message board posts and private messages from these users.')
180 180
     ),
181
-    $blocked_str?$blocked_str:'---'
181
+    $blocked_str ? $blocked_str : '---'
182 182
 );
183 183
 row2(
184 184
     tra('Block user'),
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
             <input type="text" name="forum_filter_user" size=12>
189 189
             <input class="btn btn-default" type="submit" name="add_user_to_filter" value="%s">
190 190
         ',
191
-        UNIQUE_USER_NAME?tra('User name'):tra('User ID (For instance: 123456789)'),
191
+        UNIQUE_USER_NAME ?tra('User name') : tra('User ID (For instance: 123456789)'),
192 192
         tra("Block")
193 193
     )
194 194
 );
Please login to merge, or discard this patch.
html/user/pm.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -285,7 +285,8 @@  discard block
 block discarded – undo
285 285
         // (PM reply fills in the latter)
286 286
         //
287 287
         $x = explode(' ', $username);
288
-        if (is_numeric($x[0])) {     // user ID
288
+        if (is_numeric($x[0])) {
289
+// user ID
289 290
             $userid = (int)$x[0];
290 291
             $user = BoincUser::lookup_id($userid);
291 292
             if ($user == null) {
@@ -303,7 +304,8 @@  discard block
 block discarded – undo
303 304
                     tra("Could not find user with username %1", $username)
304 305
                 );
305 306
                 return;
306
-            } elseif (count($users) > 1) { // Non-unique username
307
+            } elseif (count($users) > 1) {
308
+// Non-unique username
307 309
                 pm_form_page(
308 310
                     $replyto, $userid,
309 311
                     tra("%1 is not a unique username; you will have to use user ID", $username)
Please login to merge, or discard this 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/forum_forum.php 3 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,14 +46,14 @@
 block discarded – undo
46 46
 
47 47
     if (!$sort_style) {
48 48
         // get the sort style either from the logged in user or a cookie
49
-        if ($user){
49
+        if ($user) {
50 50
             $sort_style = $user->prefs->forum_sorting;
51 51
         } else {
52 52
             list($sort_style, $thread_style) = parse_forum_cookie();
53 53
         }
54 54
     } else {
55 55
         // set the sort style
56
-        if ($user){
56
+        if ($user) {
57 57
             $user->prefs->forum_sorting = $sort_style;
58 58
             $user->prefs->update("forum_sorting=$sort_style");
59 59
         } else {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
         page_head(sprintf("%s '%s'", tra("Forum"), $forum->title));
71 71
         if ($msg) echo "<p>$msg</p>\n";
72 72
         show_forum_header($user);
73
-        echo forum_title($category, $forum, NULL);
73
+        echo forum_title($category, $forum, null);
74 74
         break;
75 75
     case 1:
76 76
         $team = BoincTeam::lookup_id($forum->category);
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 // show a forum.
27 27
 // $user is null if not logged in
28 28
 //
29
-function forum_page($forum, $user, $msg=null) {
29
+function forum_page($forum, $user, $msg = null) {
30 30
     global $forum_sort_styles;
31 31
 
32 32
     if (DISABLE_FORUMS) {
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
 
54 54
     if (!$sort_style) {
55 55
         // get the sort style either from the logged in user or a cookie
56
-        if ($user){
56
+        if ($user) {
57 57
             $sort_style = $user->prefs->forum_sorting;
58 58
         } else {
59 59
             list($sort_style, $thread_style) = parse_forum_cookie();
60 60
         }
61 61
     } else {
62 62
         // set the sort style
63
-        if ($user){
63
+        if ($user) {
64 64
             $user->prefs->forum_sorting = $sort_style;
65 65
             $user->prefs->update("forum_sorting=$sort_style");
66 66
         } else {
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         echo "<td><a href=\"forum_thread.php?id=$thread->id\">$title</a><br></td>";
249 249
 
250 250
         echo '
251
-            <td>'.($thread->replies+1).'</td>
251
+            <td>'.($thread->replies + 1).'</td>
252 252
             <td>'.user_links($owner, BADGE_HEIGHT_SMALL).'</td>
253 253
             <td>'.$thread->views.'</td>
254 254
             <td>'.time_diff_str($thread->timestamp, time()).'</td>
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
         flush();
258 258
     }
259 259
     end_table();
260
-    echo "<br>$page_nav";    // show page links
260
+    echo "<br>$page_nav"; // show page links
261 261
 }
262 262
 
263 263
 $id = get_int("id");
Please login to merge, or discard this patch.
html/ops/delete_user.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 die("Delete this line first\n");
29 29
 
30 30
 if (is_numeric($argv[1])) {
31
-    $user = BoincUser::lookup_id((int) $argv[1]);
31
+    $user = BoincUser::lookup_id((int)$argv[1]);
32 32
     if (!$user) die("no such user\n");
33 33
     $retval = delete_account($user);
34 34
     if ($retval) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
         if ($retval) {
44 44
             echo "Failed to delete user: $retval\n";
45 45
         } else {
46
-            echo "User $user->id deleted\n";
46
+            echo "user $user->id deleted\n";
47 47
         }
48 48
     }
49 49
 }
Please login to merge, or discard this patch.
html/inc/email.inc 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 // send an email, using PHPMailer or not.
28 28
 //
29
-function send_email($user, $subject, $body, $body_html=null, $email_addr=null) {
29
+function send_email($user, $subject, $body, $body_html = null, $email_addr = null) {
30 30
     if (!$email_addr) {
31 31
         $email_addr = $user->email_addr;
32 32
     }
@@ -69,17 +69,17 @@  discard block
 block discarded – undo
69 69
             return true;
70 70
         }
71 71
     } else {
72
-        $headers ="";
72
+        $headers = "";
73 73
         if (defined('EMAIL_FROM') && defined('EMAIL_FROM_NAME')) {
74 74
             $headers = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM.">";
75 75
         } else if (defined('EMAIL_FROM')) {
76
-            $headers = "From: ". EMAIL_FROM;
76
+            $headers = "From: ".EMAIL_FROM;
77 77
         }
78 78
         if ($body_html) {
79 79
             $body = "<html><body>\n";
80 80
             $body .= $body_html;
81 81
             $body .= "\n</body></html>\n";
82
-            $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";
82
+            $headers .= 'Content-type: text/html; charset=UTF-8'."\r\n";
83 83
         }
84 84
         return mail($email_addr, $subject, $body, $headers);
85 85
     }
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
     // otherwise check both IP and email
161 161
     if ($ip && filter_var(
162 162
         $ip, FILTER_VALIDATE_IP,
163
-        FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
163
+        FILTER_FLAG_NO_PRIV_RANGE|FILTER_FLAG_NO_RES_RANGE
164 164
     )) {
165 165
         $x = @file_get_contents("https://www.stopforumspam.com/api?ip=".$ip."&email=".$addr);
166 166
     } else {
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
     return md5($key.'oogabooga');
206 206
 }
207 207
 
208
-function opt_out_url($user, $page="opt_out.php") {
208
+function opt_out_url($user, $page = "opt_out.php") {
209 209
     return sprintf("%s%s?code=%s&userid=%d",
210 210
         secure_url_base(),
211 211
         $page,
Please login to merge, or discard this patch.
html/user/forum_index.php 3 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
         if ($first) {
80 80
             $first = false;
81 81
             echo "<p>";
82
-            echo forum_title($category, NULL, NULL);
82
+            echo forum_title($category, null, null);
83 83
             echo "<p>";
84 84
             show_mark_as_read_button($user);
85 85
             start_table('table-striped');
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
         project_forum_index_intro();
70 70
     }
71 71
 
72
-    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
72
+    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE) {
73 73
         $categories = BoincCategory::enum("true order by orderID");
74 74
     } else {
75 75
         echo "<p>"
Please login to merge, or discard this 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/ops/botnet.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 //      add other criteria like # of countries (based on IP addr)
8 8
 //      consider only hosts with recent last RPC time
9 9
 
10
-define ('MAX_HOSTS', 100);
10
+define('MAX_HOSTS', 100);
11 11
 
12 12
 require_once('../inc/boinc_db.inc');
13 13
 
Please login to merge, or discard this patch.
html/user/forum_reply.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     $parent_post_id = 0;
57 57
 }
58 58
 
59
-if ($filter != "false"){
59
+if ($filter != "false") {
60 60
     $filter = true;
61 61
 } else {
62 62
     $filter = false;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 }
72 72
 
73 73
 $warning = null;
74
-if ($content && (!$preview)){
74
+if ($content && (!$preview)) {
75 75
     check_tokens($logged_in_user->authenticator);
76 76
     if (!akismet_check($logged_in_user, $content)) {
77 77
         $warning = tra("Your post has been flagged as spam by the Akismet anti-spam system. Please modify your text and try again.");
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     $parent_post_id = 0;
57 57
 }
58 58
 
59
-if ($filter != "false"){
59
+if ($filter != "false") {
60 60
     $filter = true;
61 61
 } else {
62 62
     $filter = false;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 }
72 72
 
73 73
 $warning = null;
74
-if ($content && (!$preview)){
74
+if ($content && (!$preview)) {
75 75
     check_tokens($logged_in_user->authenticator);
76 76
     if (!akismet_check($logged_in_user, $content)) {
77 77
         $warning = tra("Your post has been flagged as spam by the Akismet anti-spam system. Please modify your text and try again.");
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     }
94 94
 }
95 95
 
96
-page_head(tra("Post to thread")." '$thread->title'",'','','', $bbcode_js);
96
+page_head(tra("Post to thread")." '$thread->title'", '', '', '', $bbcode_js);
97 97
 
98 98
 if ($parent_post) {
99 99
     echo sprintf(
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
     $x2 .= " method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n";
162 162
     $x2 .= form_tokens($logged_in_user->authenticator);
163 163
     $x2 .= $bbcode_html."<textarea class=\"form-control\" name=\"content\" rows=\"18\">";
164
-    $no_quote = get_int("no_quote", true)==1;
164
+    $no_quote = get_int("no_quote", true) == 1;
165 165
     if ($preview) {
166 166
         $x2 .= htmlspecialchars($content);
167 167
     } else if (!$no_quote) {
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
170 170
         }
171 171
     }
172 172
     if (!$logged_in_user->prefs->no_signature_by_default) {
173
-        $enable_signature='checked="true"';
173
+        $enable_signature = 'checked="true"';
174 174
     } else {
175
-        $enable_signature="";
175
+        $enable_signature = "";
176 176
     }
177 177
     $x2 .= sprintf('</textarea><p> </p>
178 178
         <input class="btn btn-sm" %s type="submit" name="preview" value="%s">
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
     return sprintf(
201 201
         'In reply to %s\'s message of %s:
202 202
         [quote]%s[/quote]',
203
-        $user?$user->name:'unknown user',
203
+        $user ? $user->name : 'unknown user',
204 204
         date_str($post->timestamp),
205 205
         htmlspecialchars($post->content)
206 206
     );
Please login to merge, or discard this patch.