Passed
Push — master ( b3e64f...190fa6 )
by Vitalii
01:19 queued 20s
created
html/inc/ReCaptcha/RequestMethod/Curl.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -29,16 +29,14 @@  discard block
 block discarded – undo
29 29
 /**
30 30
  * Convenience wrapper around the cURL functions to allow mocking.
31 31
  */
32
-class Curl
33
-{
32
+class Curl {
34 33
 
35 34
     /**
36 35
      * @see http://php.net/curl_init
37 36
      * @param string $url
38 37
      * @return resource cURL handle
39 38
      */
40
-    public function init($url = null)
41
-    {
39
+    public function init($url = null) {
42 40
         return curl_init($url);
43 41
     }
44 42
 
@@ -48,8 +46,7 @@  discard block
 block discarded – undo
48 46
      * @param array $options
49 47
      * @return bool
50 48
      */
51
-    public function setoptArray($ch, array $options)
52
-    {
49
+    public function setoptArray($ch, array $options) {
53 50
         return curl_setopt_array($ch, $options);
54 51
     }
55 52
 
@@ -58,8 +55,7 @@  discard block
 block discarded – undo
58 55
      * @param resource $ch
59 56
      * @return mixed
60 57
      */
61
-    public function exec($ch)
62
-    {
58
+    public function exec($ch) {
63 59
         return curl_exec($ch);
64 60
     }
65 61
 
@@ -67,8 +63,7 @@  discard block
 block discarded – undo
67 63
      * @see http://php.net/curl_close
68 64
      * @param resource $ch
69 65
      */
70
-    public function close($ch)
71
-    {
66
+    public function close($ch) {
72 67
         curl_close($ch);
73 68
     }
74 69
 }
Please login to merge, or discard this patch.
html/inc/ReCaptcha/Response.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@  discard block
 block discarded – undo
29 29
 /**
30 30
  * The response returned from the service.
31 31
  */
32
-class Response
33
-{
32
+class Response {
34 33
     /**
35 34
      * Succes or failure.
36 35
      * @var boolean
@@ -49,8 +48,7 @@  discard block
 block discarded – undo
49 48
      * @param string $json
50 49
      * @return \ReCaptcha\Response
51 50
      */
52
-    public static function fromJson($json)
53
-    {
51
+    public static function fromJson($json) {
54 52
         $responseData = json_decode($json, true);
55 53
 
56 54
         if (!$responseData) {
@@ -74,8 +72,7 @@  discard block
 block discarded – undo
74 72
      * @param boolean $success
75 73
      * @param array $errorCodes
76 74
      */
77
-    public function __construct($success, array $errorCodes = array())
78
-    {
75
+    public function __construct($success, array $errorCodes = array()) {
79 76
         $this->success = $success;
80 77
         $this->errorCodes = $errorCodes;
81 78
     }
@@ -85,8 +82,7 @@  discard block
 block discarded – undo
85 82
      *
86 83
      * @return boolean
87 84
      */
88
-    public function isSuccess()
89
-    {
85
+    public function isSuccess() {
90 86
         return $this->success;
91 87
     }
92 88
 
@@ -95,8 +91,7 @@  discard block
 block discarded – undo
95 91
      *
96 92
      * @return array
97 93
      */
98
-    public function getErrorCodes()
99
-    {
94
+    public function getErrorCodes() {
100 95
         return $this->errorCodes;
101 96
     }
102 97
 }
Please login to merge, or discard this patch.
html/inc/ReCaptcha/RequestParameters.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@  discard block
 block discarded – undo
29 29
 /**
30 30
  * Stores and formats the parameters for the request to the reCAPTCHA service.
31 31
  */
32
-class RequestParameters
33
-{
32
+class RequestParameters {
34 33
     /**
35 34
      * Site secret.
36 35
      * @var string
@@ -63,8 +62,7 @@  discard block
 block discarded – undo
63 62
      * @param string $remoteIp User's IP address.
64 63
      * @param string $version Version of this client library.
65 64
      */
66
-    public function __construct($secret, $response, $remoteIp = null, $version = null)
67
-    {
65
+    public function __construct($secret, $response, $remoteIp = null, $version = null) {
68 66
         $this->secret = $secret;
69 67
         $this->response = $response;
70 68
         $this->remoteIp = $remoteIp;
@@ -76,8 +74,7 @@  discard block
 block discarded – undo
76 74
      *
77 75
      * @return array Array formatted parameters.
78 76
      */
79
-    public function toArray()
80
-    {
77
+    public function toArray() {
81 78
         $params = array('secret' => $this->secret, 'response' => $this->response);
82 79
 
83 80
         if (!is_null($this->remoteIp)) {
@@ -96,8 +93,7 @@  discard block
 block discarded – undo
96 93
      *
97 94
      * @return string Query string formatted parameters.
98 95
      */
99
-    public function toQueryString()
100
-    {
96
+    public function toQueryString() {
101 97
         return http_build_query($this->toArray(), '', '&');
102 98
     }
103 99
 }
Please login to merge, or discard this patch.
html/inc/dir_hier.inc 2 patches
Upper-Lower-Casing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -56,17 +56,17 @@  discard block
 block discarded – undo
56 56
     $dl_md5_path = "$dl_path.md5";
57 57
     $have_md5_file = false;
58 58
     $md5 = md5_file($path);
59
-    if ($md5 === FALSE) {
59
+    if ($md5 === false) {
60 60
         return -2;
61 61
     }
62 62
     $size = filesize($path);
63
-    if ($size === FALSE) {
63
+    if ($size === false) {
64 64
         return -2;
65 65
     }
66 66
 
67 67
     if (file_exists($dl_md5_path)) {
68 68
         $x = file_get_contents($dl_md5_path);
69
-        if ($x === FALSE) {
69
+        if ($x === false) {
70 70
             return -2;
71 71
         }
72 72
         $x = explode(" ", $x);
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     if (file_exists($dl_path)) {
79 79
         if ($have_md5_file) {
80 80
             $s = filesize($dl_path);
81
-            if ($s === FALSE) {
81
+            if ($s === false) {
82 82
                 return -2;
83 83
             }
84 84
             if ($s == $dl_size && $dl_md5 == $md5) {
@@ -91,11 +91,11 @@  discard block
 block discarded – undo
91 91
             // missing the .md5 file; need to look at the file
92 92
             //
93 93
             $m = md5_file($dl_path);
94
-            if ($m === FALSE) {
94
+            if ($m === false) {
95 95
                 return -2;
96 96
             }
97 97
             if ($m == $md5) {
98
-                if (file_put_contents($dl_md5_path, "$md5 $size\n") === FALSE) {
98
+                if (file_put_contents($dl_md5_path, "$md5 $size\n") === false) {
99 99
                     return -2;
100 100
                 }
101 101
                 return 0;
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
             return -1;
104 104
         }
105 105
     } else {
106
-        if (file_put_contents($dl_md5_path, "$md5 $size\n") === FALSE) {
106
+        if (file_put_contents($dl_md5_path, "$md5 $size\n") === false) {
107 107
             return -2;
108 108
         }
109 109
         return 1;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 }
38 38
 
39 39
 function upload_path($filename) {
40
-    static $upload_dir=null;
40
+    static $upload_dir = null;
41 41
     if (!$upload_dir) {
42 42
         $config = get_config();
43 43
         $upload_dir = parse_config($config, '<upload_dir>');
Please login to merge, or discard this patch.
html/inc/forum.inc 4 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -367,7 +367,7 @@
 block discarded – undo
367 367
                 $i++;
368 368
             }
369 369
             if ($start === null) {
370
-                echo "Post $postid not found.";
370
+                echo "post $postid not found.";
371 371
                 return;
372 372
             }
373 373
         } else if ($logged_in_user && $logged_in_user->prefs->jump_to_unread) {
Please login to merge, or discard this patch.
Braces   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 
239 239
 // return a string for navigating pages
240 240
 //
241
-function page_links($url, $nitems, $items_per_page, $start){
241
+function page_links($url, $nitems, $items_per_page, $start) {
242 242
     // How many pages to potentially show before and after this one:
243 243
     $preshow = 3;
244 244
     $postshow = 3;
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 
252 252
     // If this is not the first page, display "previous"
253 253
     //
254
-    if ($curpage > 0){
254
+    if ($curpage > 0) {
255 255
         $x .= page_link(
256 256
             $url, $curpage-1, $items_per_page,
257 257
             tra("Previous")." &middot; "
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
     }
269 269
     // Display a list of pages surrounding this one
270 270
     //
271
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
271
+    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++) {
272 272
         $page_str = (string)($i+1);
273 273
         if ($i < 0) continue;
274 274
         if ($i >= $npages) break;
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
     }
290 290
     // If there is a next page
291 291
     //
292
-    if ($curpage < $npages-1){
292
+    if ($curpage < $npages-1) {
293 293
         $x .= page_link(
294 294
             $url, $curpage+1, $items_per_page,
295 295
             " &middot; ".tra("Next")
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 
519 519
     // If the user no longer exists, skip the post
520 520
     //
521
-    if (!$user){
521
+    if (!$user) {
522 522
         return;
523 523
     }
524 524
 
@@ -539,9 +539,9 @@  discard block
 block discarded – undo
539 539
     // check whether the poster is on the list of people to ignore
540 540
     //
541 541
     $ignore_poster = false;
542
-    if ($logged_in_user){
542
+    if ($logged_in_user) {
543 543
         $tokens = url_tokens($logged_in_user->authenticator);
544
-        if (is_ignoring($logged_in_user, $user)){
544
+        if (is_ignoring($logged_in_user, $user)) {
545 545
             $ignore_poster = true;
546 546
         }
547 547
     }
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 
579 579
     // Highlight special users if set in prefs;
580 580
     //
581
-    if ($logged_in_user && $logged_in_user->prefs){
581
+    if ($logged_in_user && $logged_in_user->prefs) {
582 582
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
583 583
     } else {
584 584
         $highlight = $is_posted_by_special;
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
     echo "<span class=\"small\">";
600 600
     if ($fstatus) echo "$fstatus";
601 601
 
602
-    if (!$filter || !$ignore_poster){
602
+    if (!$filter || !$ignore_poster) {
603 603
         if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
604 604
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
605 605
         }
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
         $user->nposts = BoincPost::count("user=$user->id");
616 616
     }
617 617
 
618
-    if (function_exists('project_forum_user_info')){
618
+    if (function_exists('project_forum_user_info')) {
619 619
         project_forum_user_info($user);
620 620
     } else {
621 621
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
655 655
     }
656 656
 
657
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
657
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
658 658
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
659 659
     }
660 660
 
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
     if ($post->modified) {
675 675
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
676 676
     }
677
-    if ($ignore_poster && $filter){
677
+    if ($ignore_poster && $filter) {
678 678
         echo "<br>" .tra(
679 679
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
680 680
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
         <p>
689 689
     ";
690 690
 
691
-    if (!$filter || !$ignore_poster){
691
+    if (!$filter || !$ignore_poster) {
692 692
         $posttext = $post->content;
693 693
 
694 694
         // If the creator of this post has a signature and
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
         // user has signatures enabled: show it
697 697
         //
698 698
         $posttext = output_transform($posttext, $options);
699
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
699
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
700 700
             $sig = output_transform($user->prefs->signature, $options);
701 701
             $posttext .= "<hr>$sig\n";
702 702
         }
@@ -755,7 +755,7 @@  discard block
 block discarded – undo
755 755
     $content = output_transform($post->content, $options);
756 756
     $when = time_diff_str($post->timestamp, time());
757 757
     $user = BoincUser::lookup_id($post->user);
758
-    if (!$user){
758
+    if (!$user) {
759 759
         return;
760 760
     }
761 761
 
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 
1090 1090
     $sql = 'forum = ' . $forumID ;
1091 1091
     $stickysql = "";
1092
-    if ($sticky){
1092
+    if ($sticky) {
1093 1093
         $stickysql = "sticky DESC, ";
1094 1094
     }
1095 1095
     if (!$show_hidden) {
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
 //
1171 1171
 function show_post_moderation_links(
1172 1172
     $config, $logged_in_user, $post, $forum, $tokens
1173
-){
1173
+) {
1174 1174
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban");
1175 1175
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
1176 1176
 
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -811,9 +811,9 @@  discard block
 block discarded – undo
811 811
 function post_rules() {
812 812
     if (defined('FORUM_RULES')) return FORUM_RULES;
813 813
     if (function_exists("project_forum_post_rules")) {
814
-      $project_rules=project_forum_post_rules();
814
+        $project_rules=project_forum_post_rules();
815 815
     } else {
816
-      $project_rules="";
816
+        $project_rules="";
817 817
     }
818 818
     return sprintf("
819 819
         <ul>
@@ -1278,7 +1278,7 @@  discard block
 block discarded – undo
1278 1278
     }
1279 1279
     if ($thread->hidden) {
1280 1280
         error_page(
1281
-           tra("Can't post to a hidden thread.")
1281
+            tra("Can't post to a hidden thread.")
1282 1282
         );
1283 1283
     }
1284 1284
 
Please login to merge, or discard this patch.
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -54,12 +54,12 @@  discard block
 block discarded – undo
54 54
 define('THREAD_SOLVED', 1);
55 55
 
56 56
 define('AVATAR_WIDTH', 100);
57
-define('AVATAR_HEIGHT',100);
57
+define('AVATAR_HEIGHT', 100);
58 58
 
59 59
 define('ST_NEW_TIME', 1209600); //3600*24*14 - 14 days
60 60
 define('ST_NEW', 'New member');
61 61
 
62
-define('MAXIMUM_EDIT_TIME',3600);
62
+define('MAXIMUM_EDIT_TIME', 3600);
63 63
     // allow edits of forums posts up till one hour after posting.
64 64
 
65 65
 define('MAX_FORUM_LOGGING_TIME', 2419200); //3600*24*28 - 28 days
@@ -77,24 +77,24 @@  discard block
 block discarded – undo
77 77
 define('IMAGE_HIDDEN', 'img/hidden.png');
78 78
 define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png');
79 79
 define('IMAGE_POST', 'img/post.png');
80
-define('NEW_IMAGE_HEIGHT','15');
80
+define('NEW_IMAGE_HEIGHT', '15');
81 81
 define('EMPHASIZE_IMAGE', 'img/emphasized_post.png');
82
-define('EMPHASIZE_IMAGE_HEIGHT','15');
82
+define('EMPHASIZE_IMAGE_HEIGHT', '15');
83 83
 define('FILTER_IMAGE', 'img/filtered_post.png');
84
-define('FILTER_IMAGE_HEIGHT','15');
84
+define('FILTER_IMAGE_HEIGHT', '15');
85 85
 define('RATE_POSITIVE_IMAGE', 'img/rate_positive.png');
86
-define('RATE_POSITIVE_IMAGE_HEIGHT','9');
86
+define('RATE_POSITIVE_IMAGE_HEIGHT', '9');
87 87
 define('RATE_NEGATIVE_IMAGE', 'img/rate_negative.png');
88
-define('RATE_NEGATIVE_IMAGE_HEIGHT','9');
88
+define('RATE_NEGATIVE_IMAGE_HEIGHT', '9');
89 89
 define('REPORT_POST_IMAGE', 'img/report_post.png');
90
-define('REPORT_POST_IMAGE_HEIGHT','9');
90
+define('REPORT_POST_IMAGE_HEIGHT', '9');
91 91
 
92 92
 define('SOLUTION', tra('This answered my question'));
93 93
 define('SUFFERER', tra('I also have this question'));
94 94
 define('OFF_TOPIC', tra('Off-topic'));
95 95
 
96
-define ('DEFAULT_LOW_RATING_THRESHOLD', -25);
97
-define ('DEFAULT_HIGH_RATING_THRESHOLD', 5);
96
+define('DEFAULT_LOW_RATING_THRESHOLD', -25);
97
+define('DEFAULT_HIGH_RATING_THRESHOLD', 5);
98 98
 
99 99
 // special user attributes
100 100
 //
@@ -172,15 +172,15 @@  discard block
 block discarded – undo
172 172
 
173 173
 // return forum/thread title, with links.
174 174
 //
175
-function forum_title($category, $forum, $thread, $link_thread=false) {
175
+function forum_title($category, $forum, $thread, $link_thread = false) {
176 176
     if ($category) {
177 177
         $is_helpdesk = $category->is_helpdesk;
178 178
     } else {
179 179
         $is_helpdesk = false;
180 180
     }
181 181
 
182
-    $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards");
183
-    $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php";
182
+    $where = $is_helpdesk ?tra("Questions and Answers") : tra("Message boards");
183
+    $top_url = $is_helpdesk ? "forum_help_desk.php" : "forum_index.php";
184 184
 
185 185
     $x = '';
186 186
     if (!$forum && !$thread) {
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
     return $x;
215 215
 }
216 216
 
217
-function team_forum_title($forum, $thread=null, $link_thread=false) {
217
+function team_forum_title($forum, $thread = null, $link_thread = false) {
218 218
     $team = BoincTeam::lookup_id($forum->category);
219 219
     $x = sprintf('<a href="forum_index.php">%s</a> :',
220 220
         tra("Message boards")
@@ -248,12 +248,12 @@  discard block
 block discarded – undo
248 248
 }
249 249
 
250 250
 function page_link($url, $page_num, $items_per_page, $text) {
251
-    return " <a href=\"$url&amp;start=" . $page_num*$items_per_page . "\">$text</a> ";
251
+    return " <a href=\"$url&amp;start=".$page_num*$items_per_page."\">$text</a> ";
252 252
 }
253 253
 
254 254
 // return a string for navigating pages
255 255
 //
256
-function page_links($url, $nitems, $items_per_page, $start){
256
+function page_links($url, $nitems, $items_per_page, $start) {
257 257
     // How many pages to potentially show before and after this one:
258 258
     $preshow = 3;
259 259
     $postshow = 3;
@@ -261,14 +261,14 @@  discard block
 block discarded – undo
261 261
     $x = "";
262 262
 
263 263
     if ($nitems <= $items_per_page) return "";
264
-    $npages = ceil($nitems / $items_per_page);
265
-    $curpage = ceil($start / $items_per_page);
264
+    $npages = ceil($nitems/$items_per_page);
265
+    $curpage = ceil($start/$items_per_page);
266 266
 
267 267
     // If this is not the first page, display "previous"
268 268
     //
269
-    if ($curpage > 0){
269
+    if ($curpage > 0) {
270 270
         $x .= page_link(
271
-            $url, $curpage-1, $items_per_page,
271
+            $url, $curpage - 1, $items_per_page,
272 272
             tra("Previous")." &middot; "
273 273
         );
274 274
     }
@@ -283,8 +283,8 @@  discard block
 block discarded – undo
283 283
     }
284 284
     // Display a list of pages surrounding this one
285 285
     //
286
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
287
-        $page_str = (string)($i+1);
286
+    for ($i = $curpage - $preshow; $i <= $curpage + $postshow; $i++) {
287
+        $page_str = (string)($i + 1);
288 288
         if ($i < 0) continue;
289 289
         if ($i >= $npages) break;
290 290
 
@@ -293,20 +293,20 @@  discard block
 block discarded – undo
293 293
         } else {
294 294
             $x .= page_link($url, $i, $items_per_page, $page_str);
295 295
         }
296
-        if ($i == $npages-1) break;
297
-        if ($i == $curpage+$postshow) break;
296
+        if ($i == $npages - 1) break;
297
+        if ($i == $curpage + $postshow) break;
298 298
         $x .= " &middot; ";
299 299
     }
300 300
 
301
-    if ($curpage + $postshow < $npages-1) {
301
+    if ($curpage + $postshow < $npages - 1) {
302 302
         $x .= " . . . ";
303
-        $x .= page_link($url, $npages-1, $items_per_page, $npages);
303
+        $x .= page_link($url, $npages - 1, $items_per_page, $npages);
304 304
     }
305 305
     // If there is a next page
306 306
     //
307
-    if ($curpage < $npages-1){
307
+    if ($curpage < $npages - 1) {
308 308
         $x .= page_link(
309
-            $url, $curpage+1, $items_per_page,
309
+            $url, $curpage + 1, $items_per_page,
310 310
             " &middot; ".tra("Next")
311 311
         );
312 312
     }
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 function cleanup_title($title) {
328 328
     $x = sanitize_tags(bb2html($title));
329 329
     $x = trim($x);
330
-    if (strlen($x)==0) return "(no title)";
330
+    if (strlen($x) == 0) return "(no title)";
331 331
     else return $x;
332 332
 }
333 333
 
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
             $i = 0;
390 390
             foreach ($posts as $post) {
391 391
                 if ($post->id == $postid) {
392
-                    $start = $i - ($i % $num_to_show);
392
+                    $start = $i - ($i%$num_to_show);
393 393
                     $jump_to_post = $post;
394 394
                     break;
395 395
                 }
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
             // if jump to post, figure out what page to show
417 417
             //
418 418
             if ($jump_to_post) {
419
-                $start = $ibest - ($ibest % $num_to_show);
419
+                $start = $ibest - ($ibest%$num_to_show);
420 420
             } else {
421 421
                 $start = $default_start;
422 422
             }
@@ -524,8 +524,8 @@  discard block
 block discarded – undo
524 524
 // Generates a table row with two cells: author and message
525 525
 //
526 526
 function show_post(
527
-    $post, $thread, $forum, $logged_in_user, $start=0,
528
-    $latest_viewed=0, $controls=FORUM_CONTROLS, $filter=true
527
+    $post, $thread, $forum, $logged_in_user, $start = 0,
528
+    $latest_viewed = 0, $controls = FORUM_CONTROLS, $filter = true
529 529
 ) {
530 530
     global $country_to_iso3166_2;
531 531
 
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
 
534 534
     // If the user no longer exists, skip the post
535 535
     //
536
-    if (!$user){
536
+    if (!$user) {
537 537
         return;
538 538
     }
539 539
 
@@ -554,9 +554,9 @@  discard block
 block discarded – undo
554 554
     // check whether the poster is on the list of people to ignore
555 555
     //
556 556
     $ignore_poster = false;
557
-    if ($logged_in_user){
557
+    if ($logged_in_user) {
558 558
         $tokens = url_tokens($logged_in_user->authenticator);
559
-        if (is_ignoring($logged_in_user, $user)){
559
+        if (is_ignoring($logged_in_user, $user)) {
560 560
             $ignore_poster = true;
561 561
         }
562 562
     }
@@ -570,8 +570,8 @@  discard block
 block discarded – undo
570 570
             if (is_moderator($logged_in_user, $forum)) {
571 571
                 $can_edit = true;
572 572
             } else if (can_reply($thread, $forum, $logged_in_user)) {
573
-                $time_limit = $post->timestamp+MAXIMUM_EDIT_TIME;
574
-                $can_edit = time()<$time_limit;
573
+                $time_limit = $post->timestamp + MAXIMUM_EDIT_TIME;
574
+                $can_edit = time() < $time_limit;
575 575
             } else {
576 576
                 $can_edit = false;
577 577
             }
@@ -581,24 +581,24 @@  discard block
 block discarded – undo
581 581
     // Print the special user lines, if any
582 582
     //
583 583
     global $special_user_bitfield;
584
-    $fstatus="";
584
+    $fstatus = "";
585 585
     $keys = array_keys($special_user_bitfield);
586 586
     $is_posted_by_special = false;
587
-    for ($i=0; $i<sizeof($special_user_bitfield);$i++) {
587
+    for ($i = 0; $i < sizeof($special_user_bitfield); $i++) {
588 588
         if ($user->prefs && $user->prefs->privilege($keys[$i])) {
589
-            $fstatus.="<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
589
+            $fstatus .= "<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
590 590
             $is_posted_by_special = true;
591 591
         }
592 592
     }
593 593
 
594 594
     // Highlight special users if set in prefs;
595 595
     //
596
-    if ($logged_in_user && $logged_in_user->prefs){
596
+    if ($logged_in_user && $logged_in_user->prefs) {
597 597
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
598 598
     } else {
599 599
         $highlight = $is_posted_by_special;
600 600
     }
601
-    $class = $highlight?' style="border-left: 5px solid LightGreen" ':'';
601
+    $class = $highlight ? ' style="border-left: 5px solid LightGreen" ' : '';
602 602
 
603 603
     // row and start of author col
604 604
     //
@@ -610,12 +610,12 @@  discard block
 block discarded – undo
610 610
 
611 611
     echo user_links($user, 0, 30);
612 612
     echo "<br>";
613
-    if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
613
+    if ($user->create_time > time() - ST_NEW_TIME) $fstatus .= ST_NEW."<br>";
614 614
     echo "<span class=\"small\">";
615 615
     if ($fstatus) echo "$fstatus";
616 616
 
617
-    if (!$filter || !$ignore_poster){
618
-        if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
617
+    if (!$filter || !$ignore_poster) {
618
+        if ($user->prefs && $user->prefs->avatar != "" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars == false))) {
619 619
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
620 620
         }
621 621
     }
@@ -623,14 +623,14 @@  discard block
 block discarded – undo
623 623
 
624 624
     $url = "pm.php?action=new&amp;userid=".$user->id;
625 625
     $name = $user->name;
626
-    show_button_small($url, tra("Send message"), tra("Send %1 a private message",$name));
626
+    show_button_small($url, tra("Send message"), tra("Send %1 a private message", $name));
627 627
     echo '<br>'.tra("Joined: %1", gmdate('j M y', $user->create_time)), "<br>";
628 628
 
629 629
     if (!isset($user->nposts)) {
630 630
         $user->nposts = BoincPost::count("user=$user->id");
631 631
     }
632 632
 
633
-    if (function_exists('project_forum_user_info')){
633
+    if (function_exists('project_forum_user_info')) {
634 634
         project_forum_user_info($user);
635 635
     } else {
636 636
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -639,8 +639,8 @@  discard block
 block discarded – undo
639 639
         //
640 640
         //echo "ID: ".$user->id."<br>";
641 641
         if (!NO_COMPUTING) {
642
-            echo tra("Credit: %1", number_format($user->total_credit)) ."<br>";
643
-            echo tra("RAC: %1",    number_format($user->expavg_credit))."<br>";
642
+            echo tra("Credit: %1", number_format($user->total_credit))."<br>";
643
+            echo tra("RAC: %1", number_format($user->expavg_credit))."<br>";
644 644
         }
645 645
 
646 646
         // to use this feature:
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
670 670
     }
671 671
 
672
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
672
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
673 673
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
674 674
     }
675 675
 
@@ -689,8 +689,8 @@  discard block
 block discarded – undo
689 689
     if ($post->modified) {
690 690
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
691 691
     }
692
-    if ($ignore_poster && $filter){
693
-        echo "<br>" .tra(
692
+    if ($ignore_poster && $filter) {
693
+        echo "<br>".tra(
694 694
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
695 695
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
696 696
             "</a>"
@@ -703,7 +703,7 @@  discard block
 block discarded – undo
703 703
         <p>
704 704
     ";
705 705
 
706
-    if (!$filter || !$ignore_poster){
706
+    if (!$filter || !$ignore_poster) {
707 707
         $posttext = $post->content;
708 708
 
709 709
         // If the creator of this post has a signature and
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
         // user has signatures enabled: show it
712 712
         //
713 713
         $posttext = output_transform($posttext, $options);
714
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
714
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
715 715
             $sig = output_transform($user->prefs->signature, $options);
716 716
             $posttext .= "<hr>$sig\n";
717 717
         }
@@ -745,10 +745,10 @@  discard block
 block discarded – undo
745 745
         }
746 746
         if (($controls == FORUM_CONTROLS) && (can_reply($thread, $forum, $logged_in_user))) {
747 747
             echo "&nbsp;&nbsp;&nbsp;&nbsp;";
748
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "&amp;no_quote=1#input";
748
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."&amp;no_quote=1#input";
749 749
             // "Reply" is used as a verb
750 750
             show_button($url, tra("Reply"), tra("Post a reply to this message"));
751
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "#input";
751
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."#input";
752 752
             // "Quote" is used as a verb
753 753
             show_button($url, tra("Quote"), tra("Post a reply by quoting this message"));
754 754
         }
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
     $content = output_transform($post->content, $options);
771 771
     $when = time_diff_str($post->timestamp, time());
772 772
     $user = BoincUser::lookup_id($post->user);
773
-    if (!$user){
773
+    if (!$user) {
774 774
         return;
775 775
     }
776 776
 
@@ -826,9 +826,9 @@  discard block
 block discarded – undo
826 826
 function post_rules() {
827 827
     if (defined('FORUM_RULES')) return FORUM_RULES;
828 828
     if (function_exists("project_forum_post_rules")) {
829
-      $project_rules=project_forum_post_rules();
829
+      $project_rules = project_forum_post_rules();
830 830
     } else {
831
-      $project_rules="";
831
+      $project_rules = "";
832 832
     }
833 833
     return sprintf("
834 834
         <ul>
@@ -857,7 +857,7 @@  discard block
 block discarded – undo
857 857
     );
858 858
 }
859 859
 
860
-function post_warning($forum=null) {
860
+function post_warning($forum = null) {
861 861
     $x = "<br><br>
862 862
         <table><tr><td align=left>
863 863
     ";
@@ -945,7 +945,7 @@  discard block
 block discarded – undo
945 945
     $content = substr($content, 0, 64000);
946 946
     $content = BoincDb::escape_string($content);
947 947
     $now = time();
948
-    $sig = $signature?1:0;
948
+    $sig = $signature ? 1 : 0;
949 949
     $id = BoincPost::insert("(thread, user, timestamp, content, modified, parent_post, score, votes, signature, hidden) values ($thread->id, $user->id, $now, '$content', 0, $parent_id, 0, 0, $sig, 0)");
950 950
     if (!$id) {
951 951
         $forum_error = "Failed to add post to DB.";
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
965 965
 //
966 966
 function update_thread_timestamp($thread) {
967 967
     $posts = BoincPost::enum("thread=$thread->id and hidden=0 order by timestamp desc limit 1");
968
-    if (count($posts)>0) {
968
+    if (count($posts) > 0) {
969 969
         $post = $posts[0];
970 970
         $thread->update("timestamp=$post->timestamp");
971 971
     }
@@ -973,7 +973,7 @@  discard block
 block discarded – undo
973 973
 
974 974
 function update_forum_timestamp($forum) {
975 975
     $threads = BoincThread::enum("forum=$forum->id and hidden=0 order by timestamp desc limit 1");
976
-    if (count($threads)>0) {
976
+    if (count($threads) > 0) {
977 977
         $thread = $threads[0];
978 978
         $forum->update("timestamp=$thread->timestamp");
979 979
     }
@@ -996,7 +996,7 @@  discard block
 block discarded – undo
996 996
     if (is_news_forum($forum) && !$export) {
997 997
         $status = 1;
998 998
     }
999
-    $id  = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
999
+    $id = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
1000 1000
     if (!$id) {
1001 1001
         $forum_error = "Failed to add thread to DB.";
1002 1002
         return null;
@@ -1126,22 +1126,22 @@  discard block
 block discarded – undo
1126 1126
 // $sticky - bool (not directly passed to SQL)
1127 1127
 //
1128 1128
 function get_forum_threads(
1129
-    $forumID, $start=-1, $nRec=-1, $sort_style=MODIFIED_NEW,
1129
+    $forumID, $start = -1, $nRec = -1, $sort_style = MODIFIED_NEW,
1130 1130
     $show_hidden = 0, $sticky = 1
1131 1131
 ) {
1132 1132
     //if (! (is_numeric($forumID) && is_numeric($min) && is_numeric($nRec))) {
1133 1133
     //    return NULL;  // Something is wrong here.
1134 1134
     //}
1135 1135
 
1136
-    $sql = 'forum = ' . $forumID ;
1136
+    $sql = 'forum = '.$forumID;
1137 1137
     $stickysql = "";
1138
-    if ($sticky){
1138
+    if ($sticky) {
1139 1139
         $stickysql = "sticky DESC, ";
1140 1140
     }
1141 1141
     if (!$show_hidden) {
1142 1142
         $sql .= ' AND hidden = 0';
1143 1143
     }
1144
-    switch($sort_style) {
1144
+    switch ($sort_style) {
1145 1145
     case MODIFIED_NEW:
1146 1146
         $sql .= ' ORDER BY '.$stickysql.'timestamp DESC';
1147 1147
         break;
@@ -1194,7 +1194,7 @@  discard block
 block discarded – undo
1194 1194
     if (!$show_hidden) {
1195 1195
         $sql .= ' AND hidden = 0';
1196 1196
     }
1197
-    switch($sort_style) {
1197
+    switch ($sort_style) {
1198 1198
     case CREATE_TIME_NEW:
1199 1199
         $sql .= ' ORDER BY timestamp desc';
1200 1200
         break;
@@ -1216,7 +1216,7 @@  discard block
 block discarded – undo
1216 1216
 //
1217 1217
 function show_post_moderation_links(
1218 1218
     $config, $logged_in_user, $post, $forum, $tokens
1219
-){
1219
+) {
1220 1220
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban");
1221 1221
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
1222 1222
 
@@ -1303,14 +1303,14 @@  discard block
 block discarded – undo
1303 1303
     // We do not tell the (ab)user how much this is -
1304 1304
     // no need to make it easy for them to break the system.
1305 1305
     //
1306
-    if ($user->total_credit<$forum->post_min_total_credit || $user->expavg_credit<$forum->post_min_expavg_credit) {
1306
+    if ($user->total_credit < $forum->post_min_total_credit || $user->expavg_credit < $forum->post_min_expavg_credit) {
1307 1307
         error_page(tra("To create a new thread in %1 you must have a certain level of average credit. This is to protect against abuse of the system.", $forum->title));
1308 1308
     }
1309 1309
 
1310 1310
     // If the user is posting faster than forum regulations allow
1311 1311
     // Tell the user to wait a while before creating any more posts
1312 1312
     //
1313
-    if (time()-$user->prefs->last_post <$forum->post_min_interval) {
1313
+    if (time() - $user->prefs->last_post < $forum->post_min_interval) {
1314 1314
         error_page(tra("You cannot create threads right now. Please wait before trying again. This is to protect against abuse of the system."));
1315 1315
     }
1316 1316
 }
@@ -1336,10 +1336,10 @@  discard block
 block discarded – undo
1336 1336
 // - edit their posts at any time
1337 1337
 // - hide/unhide/move threads and posts
1338 1338
 
1339
-function is_moderator($user, $forum=null) {
1339
+function is_moderator($user, $forum = null) {
1340 1340
     if (!$user) return false;
1341 1341
     BoincForumPrefs::lookup($user);
1342
-    $type = $forum?$forum->parent_type:0;
1342
+    $type = $forum ? $forum->parent_type : 0;
1343 1343
     switch ($type) {
1344 1344
     case 0:
1345 1345
         if ($user->prefs->privilege(S_MODERATOR)) return true;
@@ -1356,7 +1356,7 @@  discard block
 block discarded – undo
1356 1356
     return false;
1357 1357
 }
1358 1358
 
1359
-function thread_list_header($subscriptions=false) {
1359
+function thread_list_header($subscriptions = false) {
1360 1360
     if ($subscriptions) {
1361 1361
         $x = [
1362 1362
             tra("Thread"),
@@ -1379,13 +1379,13 @@  discard block
 block discarded – undo
1379 1379
 // show a 1-line summary of thread and its forum.
1380 1380
 // Used for search results and subscription list
1381 1381
 //
1382
-function thread_list_item($thread, $user, $subscriptions=false) {
1382
+function thread_list_item($thread, $user, $subscriptions = false) {
1383 1383
     $thread_forum = BoincForum::lookup_id($thread->forum);
1384 1384
     if (!$thread_forum) return;
1385 1385
     if (!is_forum_visible_to_user($thread_forum, $user)) return;
1386 1386
     $owner = BoincUser::lookup_id($thread->owner);
1387 1387
     if (!$owner) return;
1388
-    switch($thread_forum->parent_type) {
1388
+    switch ($thread_forum->parent_type) {
1389 1389
     case 0:
1390 1390
         $category = BoincCategory::lookup_id($thread_forum->category);
1391 1391
         $title = forum_title($category, $thread_forum, $thread, true);
@@ -1406,7 +1406,7 @@  discard block
 block discarded – undo
1406 1406
     } else {
1407 1407
         $x = [
1408 1408
             $title,
1409
-            $thread->replies+1,
1409
+            $thread->replies + 1,
1410 1410
             user_links($owner),
1411 1411
             $thread->views,
1412 1412
             time_diff_str($thread->timestamp, time())
@@ -1441,13 +1441,13 @@  discard block
 block discarded – undo
1441 1441
 
1442 1442
 function subscribed_thread_web_line($notify) {
1443 1443
     $thread = BoincThread::lookup_id($notify->opaque);
1444
-    return tra("New posts in the thread %1","<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
1444
+    return tra("New posts in the thread %1", "<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
1445 1445
 }
1446 1446
 
1447 1447
 function subscribed_thread_rss($notify) {
1448 1448
     $thread = BoincThread::lookup_id($notify->opaque);
1449 1449
     $title = tra("New posts in subscribed thread");
1450
-    $msg = tra("There are new posts in the thread '%1'",$thread->title);
1450
+    $msg = tra("There are new posts in the thread '%1'", $thread->title);
1451 1451
     $url = secure_url_base()."forum_thread.php?id=$thread->id";
1452 1452
     return [$title, $msg, $url];
1453 1453
 }
@@ -1459,13 +1459,13 @@  discard block
 block discarded – undo
1459 1459
 
1460 1460
 function subscribed_forum_web_line($notify) {
1461 1461
     $forum = BoincForum::lookup_id($notify->opaque);
1462
-    return tra("New threads in the forum %1","<a href=forum_forum.php?id=$forum->id>$forum->title</a>");
1462
+    return tra("New threads in the forum %1", "<a href=forum_forum.php?id=$forum->id>$forum->title</a>");
1463 1463
 }
1464 1464
 
1465 1465
 function subscribed_forum_rss($notify) {
1466 1466
     $forum = BoincForum::lookup_id($notify->opaque);
1467 1467
     $title = tra("New posts in subscribed forum");
1468
-    $msg = tra("There are new threads in the forum '%1'",$forum->title);
1468
+    $msg = tra("There are new threads in the forum '%1'", $forum->title);
1469 1469
     $url = secure_url_base()."forum_forum.php?id=$forum->id";
1470 1470
     return [$title, $msg, $url];
1471 1471
 }
Please login to merge, or discard this patch.
html/inc/prefs.inc 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -556,7 +556,7 @@
 block discarded – undo
556 556
 function print_prefs_form(
557 557
     $action, $subset, $venue, $user, $prefs, $cols, $error=false,
558 558
     $project_error=false
559
-){
559
+) {
560 560
     if ($action == "add") {
561 561
         $script = "add_venue.php";
562 562
         $submit_value = tra("Add preferences");
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         new NUM_SPEC(tra("% of the CPUs"), 1, 100, 0)
109 109
     ),
110 110
     new PREF_NUM(
111
-        tra("Use at most") ."<br><font size=-2>Requires BOINC 7.20.3+</font>",
111
+        tra("Use at most")."<br><font size=-2>Requires BOINC 7.20.3+</font>",
112 112
         // xgettext:no-php-format
113 113
         tra("Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat."),
114 114
         "niu_cpu_usage_limit",
@@ -295,9 +295,9 @@  discard block
 block discarded – undo
295 295
     $dp->disk_max_used_pct = parse_config($config, "<default_disk_max_used_pct>");
296 296
     $dp->disk_min_free_gb = parse_config($config, "<default_disk_min_free_gb>");
297 297
     // set some defaults if not found
298
-    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
298
+    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0; // no limit
299 299
     if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
300
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
300
+    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1; // 1 GB
301 301
     // set mininimum free space scheduler allows
302 302
     // - depends on which scheduler is running
303 303
     $dp->new_sched_flag = 1;
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
     global $text;
324 324
     global $venue_name;
325 325
 
326
-    switch($name) {
326
+    switch ($name) {
327 327
     case "venue":
328 328
         if (array_key_exists("name", $attrs)) {
329 329
             $venue_name = $attrs["name"];
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
             return;
374 374
         }
375 375
     }
376
-    switch($name) {
376
+    switch ($name) {
377 377
     case "venue":
378 378
         $top_parse_result->$venue_name = $parse_result;
379 379
         $parse_result = $top_parse_result;
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
     }
548 548
 }
549 549
 
550
-function print_prefs_display_global($user, $columns=false) {
550
+function print_prefs_display_global($user, $columns = false) {
551 551
     $global_prefs = prefs_parse_global($user->global_prefs);
552 552
 
553 553
     echo tra("These settings apply to all computers using this account except")
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
         .tra("Android devices")
558 558
         ."</ul>
559 559
     ";
560
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch view)")."</a></font>";
560
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=".(int)!$columns.">".tra("(Switch view)")."</a></font>";
561 561
     if ($columns) {
562 562
         echo "<h3>".tra("Combined preferences").$switch_link."</h3>";
563 563
         start_table();
@@ -594,9 +594,9 @@  discard block
 block discarded – undo
594 594
 // otherwise false
595 595
 //
596 596
 function print_prefs_form(
597
-    $action, $subset, $venue, $user, $prefs, $cols, $error=false,
598
-    $project_error=false
599
-){
597
+    $action, $subset, $venue, $user, $prefs, $cols, $error = false,
598
+    $project_error = false
599
+) {
600 600
     if ($action == "add") {
601 601
         $script = "add_venue.php";
602 602
         $submit_value = tra("Add preferences");
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 //
637 637
 // Functions to display preference subsets as forms
638 638
 //
639
-function prefs_form_global($user, $prefs, $error=false) {
639
+function prefs_form_global($user, $prefs, $error = false) {
640 640
     global $in_use_prefs;
641 641
     global $not_in_use_prefs;
642 642
     global $job_prefs;
@@ -673,9 +673,9 @@  discard block
 block discarded – undo
673 673
 //
674 674
 function prefs_form_radio_buttons($name, $yesno) {
675 675
     $rb = tra("yes")." <input type=radio name=$name value=yes "
676
-        .($yesno?"checked":"")
676
+        .($yesno ? "checked" : "")
677 677
         ."> ".tra("no")." <input type=radio name=$name value=no "
678
-        .($yesno?"":"checked")
678
+        .($yesno ? "" : "checked")
679 679
         .">\n";
680 680
     return $rb;
681 681
 }
@@ -694,12 +694,12 @@  discard block
 block discarded – undo
694 694
 }
695 695
 function venue_show($user) {
696 696
     $venue = $user->venue;
697
-    if ($venue =='') $venue = '---';
697
+    if ($venue == '') $venue = '---';
698 698
     tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
699 699
 }
700 700
 
701 701
 function venue_form($user) {
702
-    $n=$h=$w=$s=$m='';
702
+    $n = $h = $w = $s = $m = '';
703 703
     if ($user->venue == '') $n = 'selected';
704 704
     if ($user->venue == 'home') $h = 'selected';
705 705
     if ($user->venue == 'work') $w = 'selected';
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
 //
758 758
 // convert prefs from structure to XML
759 759
 //
760
-function global_prefs_make_xml($prefs, $primary=true) {
760
+function global_prefs_make_xml($prefs, $primary = true) {
761 761
     global $in_use_prefs;
762 762
     global $not_in_use_prefs;
763 763
     global $job_prefs;
Please login to merge, or discard this patch.
html/inc/result.inc 2 patches
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -500,9 +500,9 @@  discard block
 block discarded – undo
500 500
 // @return String A human readable error message
501 501
 // @param Integer $x An error number
502 502
 //
503
-function windows_error_code_str($x){
503
+function windows_error_code_str($x) {
504 504
     $h=int2hex($x);
505
-    switch($h){
505
+    switch($h) {
506 506
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
507 507
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
508 508
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -523,10 +523,10 @@  discard block
 block discarded – undo
523 523
 // @return String A human readable error message
524 524
 // @param Integer $x An error number
525 525
 //
526
-function error_code_str($x){
526
+function error_code_str($x) {
527 527
     // severe Windows error numbers are always large negative integers
528 528
     if ($x<-400) return windows_error_code_str($x);
529
-    switch($x){
529
+    switch($x) {
530 530
     case 0: return "";
531 531
     case 192: return "EXIT_STATEFILE_WRITE";
532 532
     case 193: return "EXIT_SIGNAL";
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
     return $platforms[$id];
54 54
 }
55 55
 
56
-function anon_platform_string($result, $rsc_name=null) {
56
+function anon_platform_string($result, $rsc_name = null) {
57 57
     $app = get_app($result->appid);
58
-    $n = $app->user_friendly_name."<br>".  tra("Anonymous platform");
58
+    $n = $app->user_friendly_name."<br>".tra("Anonymous platform");
59 59
     if ($rsc_name) {
60 60
         $n .= " ($rsc_name)";
61 61
     }
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         return $string_to_show;
98 98
     }
99 99
     if ($result->server_state <> RESULT_SERVER_STATE_OVER) return "---";
100
-    switch($result->outcome) {
100
+    switch ($result->outcome) {
101 101
     case RESULT_OUTCOME_SUCCESS:
102 102
         switch ($result->validate_state) {
103 103
         case VALIDATE_STATE_INIT:
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
             ) {
213 213
                 return tra("Not started by deadline - canceled");
214 214
             }
215
-            switch($result->client_state) {
215
+            switch ($result->client_state) {
216 216
             case RESULT_FILES_DOWNLOADING: return tra("Error while downloading");
217 217
             case RESULT_FILES_DOWNLOADED:
218 218
             case RESULT_COMPUTE_ERROR: return tra("Error while computing");
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 }
232 232
 
233 233
 function result_server_state_string($result) {
234
-    switch($result->server_state) {
234
+    switch ($result->server_state) {
235 235
     case RESULT_SERVER_STATE_INACTIVE: return tra("Inactive");
236 236
     case RESULT_SERVER_STATE_UNSENT: return tra("Unsent");
237 237
     case RESULT_SERVER_STATE_IN_PROGRESS: return tra("In progress");
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 }
242 242
 
243 243
 function result_outcome_string($result) {
244
-    switch($result->outcome) {
244
+    switch ($result->outcome) {
245 245
     case RESULT_OUTCOME_INIT: return "---";
246 246
     case RESULT_OUTCOME_SUCCESS: return tra("Success");
247 247
     case RESULT_OUTCOME_COULDNT_SEND: return tra("Couldn't send");
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 }
260 260
 
261 261
 function result_client_state_string($result) {
262
-    switch($result->client_state) {
262
+    switch ($result->client_state) {
263 263
     case RESULT_NEW: return tra("New");
264 264
     case RESULT_FILES_DOWNLOADING: return tra("Downloading");
265 265
     case RESULT_FILES_DOWNLOADED: return tra("Processing");
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 }
278 278
 
279 279
 function validate_state_str($result) {
280
-    switch($result->validate_state) {
280
+    switch ($result->validate_state) {
281 281
     case VALIDATE_STATE_INIT: return tra("Initial");
282 282
     case VALIDATE_STATE_VALID: return tra("Valid");
283 283
     case VALIDATE_STATE_INVALID:
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 }
294 294
 
295 295
 function assimilate_state_str($s) {
296
-    switch($s) {
296
+    switch ($s) {
297 297
     case ASSIMILATE_INIT: return "Initial";
298 298
     case ASSIMILATE_READY: return "Ready to assimilate";
299 299
     case ASSIMILATE_DONE: return "Assimilated";
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 }
303 303
 
304 304
 function file_delete_state_str($s) {
305
-    switch($s) {
305
+    switch ($s) {
306 306
     case FILE_DELETE_INIT: return "Initial";
307 307
     case FILE_DELETE_READY: return "Ready to delete";
308 308
     case FILE_DELETE_DONE: return "Deleted";
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 // convert WU error bitmask to str.
315 315
 // If $color, add HTML red color
316 316
 //
317
-function wu_error_mask_str($s, $color=false) {
317
+function wu_error_mask_str($s, $color = false) {
318 318
     $x = "";
319 319
     if ($s & WU_ERROR_COULDNT_SEND_RESULT) {
320 320
         $x = $x." ".tra("Couldn't send result");
@@ -428,10 +428,10 @@  discard block
 block discarded – undo
428 428
     if ($result->received_time) {
429 429
         $r = time_str($result->received_time);
430 430
     } else if ($result->report_deadline) {
431
-        if ($result->report_deadline>time()) {
432
-            $r = "<font color='#33cc33'>" . time_str($result->report_deadline) . "</font>";
431
+        if ($result->report_deadline > time()) {
432
+            $r = "<font color='#33cc33'>".time_str($result->report_deadline)."</font>";
433 433
         } else {
434
-            $r = "<font color='#ff3333'>" . time_str($result->report_deadline) . "</font>";
434
+            $r = "<font color='#ff3333'>".time_str($result->report_deadline)."</font>";
435 435
         }
436 436
     } else {
437 437
         $r = "---";
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
 // @param Integer $dec A signed integer
493 493
 //
494 494
 function int2hex($dec) {
495
-    return "0x".strtoupper(substr(sprintf("%08x",$dec), -8));
495
+    return "0x".strtoupper(substr(sprintf("%08x", $dec), -8));
496 496
 }
497 497
 
498 498
 // Decode a windows error number into semi-human-readable,
@@ -502,9 +502,9 @@  discard block
 block discarded – undo
502 502
 // @return String A human readable error message
503 503
 // @param Integer $x An error number
504 504
 //
505
-function windows_error_code_str($x){
506
-    $h=int2hex($x);
507
-    switch($h){
505
+function windows_error_code_str($x) {
506
+    $h = int2hex($x);
507
+    switch ($h) {
508 508
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
509 509
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
510 510
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -525,10 +525,10 @@  discard block
 block discarded – undo
525 525
 // @return String A human readable error message
526 526
 // @param Integer $x An error number
527 527
 //
528
-function error_code_str($x){
528
+function error_code_str($x) {
529 529
     // severe Windows error numbers are always large negative integers
530
-    if ($x<-400) return windows_error_code_str($x);
531
-    switch($x){
530
+    if ($x < -400) return windows_error_code_str($x);
531
+    switch ($x) {
532 532
     case 0: return "";
533 533
     case 192: return "EXIT_STATEFILE_WRITE";
534 534
     case 193: return "EXIT_SIGNAL";
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
     return $x." (".int2hex($x).") ".error_code_str($x);
690 690
 }
691 691
 
692
-function show_result($result, $show_outfile_links=false) {
692
+function show_result($result, $show_outfile_links = false) {
693 693
     start_table();
694 694
     row2(tra("Name"), $result->name);
695 695
     row2(tra("Workunit"), "<a href=\"workunit.php?wuid=$result->workunitid\">$result->workunitid</a>");
@@ -740,7 +740,7 @@  discard block
 block discarded – undo
740 740
     echo "<h3>".tra("Stderr output")."</h3> <pre>"
741 741
         .htmlspecialchars(
742 742
             $result->stderr_out,
743
-            ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0),
743
+            ENT_QUOTES|(defined('ENT_SUBSTITUTE') ?ENT_SUBSTITUTE:0),
744 744
             'utf-8'
745 745
         )
746 746
         ."</pre>"
@@ -755,7 +755,7 @@  discard block
 block discarded – undo
755 755
 
756 756
     $apps = BoincApp::enum('deprecated=0 ORDER BY user_friendly_name');
757 757
 
758
-    for ($i=0; $i<NSTATES; $i++) {
758
+    for ($i = 0; $i < NSTATES; $i++) {
759 759
         $state_count[$i] = 0;
760 760
     }
761 761
     foreach ($apps as $app) {
@@ -798,7 +798,7 @@  discard block
 block discarded – undo
798 798
         $x .= "<a href=$url>".tra("Next")." ".$info->results_per_page."</a>";
799 799
     }
800 800
     $x .= "<br>".tra("State").": ";
801
-    for ($i=0; $i<NSTATES; $i++) {
801
+    for ($i = 0; $i < NSTATES; $i++) {
802 802
         if ($i) $x .= " &middot; ";
803 803
         if ($info->state == $i) {
804 804
             $x .= $state_name[$i];
@@ -843,6 +843,6 @@  discard block
 block discarded – undo
843 843
     return $x;
844 844
 }
845 845
 
846
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
846
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
847 847
 
848 848
 ?>
Please login to merge, or discard this patch.
html/inc/countries.inc 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -505,7 +505,7 @@
 block discarded – undo
505 505
     geoip_close($gi);
506 506
 
507 507
     if ($selected_country=="") $selected_country="None";
508
-    if ($selected_country=="None" and $geoip_country!=""){
508
+    if ($selected_country=="None" and $geoip_country!="") {
509 509
         $selected_country=$geoip_country;
510 510
     }
511 511
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
     "Zimbabwe"
258 258
 );
259 259
 
260
-$country_to_iso3166_2 = array (
260
+$country_to_iso3166_2 = array(
261 261
     "Afghanistan" => "af",
262 262
     "Albania" => "al",
263 263
     "Algeria" => "dz",
@@ -493,25 +493,25 @@  discard block
 block discarded – undo
493 493
 
494 494
 // return a list of country options for a <select>
495 495
 //
496
-function country_select_options($selected_country="None") {
496
+function country_select_options($selected_country = "None") {
497 497
     global $countries;
498 498
 
499 499
     require_once("../inc/geoip.inc");
500 500
 
501 501
     // See if we can find the user's country and select it as default:
502 502
     //
503
-    $gi = geoip_open("../inc/GeoIP.dat",GEOIP_STANDARD);
504
-    $geoip_country = geoip_country_name_by_addr($gi,$_SERVER["REMOTE_ADDR"]);
503
+    $gi = geoip_open("../inc/GeoIP.dat", GEOIP_STANDARD);
504
+    $geoip_country = geoip_country_name_by_addr($gi, $_SERVER["REMOTE_ADDR"]);
505 505
     geoip_close($gi);
506 506
 
507
-    if ($selected_country=="") $selected_country="None";
508
-    if ($selected_country=="None" and $geoip_country!=""){
509
-        $selected_country=$geoip_country;
507
+    if ($selected_country == "") $selected_country = "None";
508
+    if ($selected_country == "None" and $geoip_country != "") {
509
+        $selected_country = $geoip_country;
510 510
     }
511 511
 
512 512
     $x = "";
513 513
     foreach ($countries as $country) {
514
-        $selected = ($selected_country == $country ? "selected":"");
514
+        $selected = ($selected_country == $country ? "selected" : "");
515 515
         $x .= "<option value=\"$country\" $selected>$country</option>\n";
516 516
     }
517 517
     return $x;
Please login to merge, or discard this patch.
html/project.sample/project.inc 2 patches
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -183,15 +183,15 @@  discard block
 block discarded – undo
183 183
     </ol>", PROJECT);
184 184
 }
185 185
 
186
-function project_workunit($wu){
186
+function project_workunit($wu) {
187 187
     // shown in the workunit page
188 188
 }
189 189
 
190
-function project_user_summary($user){
190
+function project_user_summary($user) {
191 191
     // shown in the user summary page
192 192
 }
193 193
 
194
-function project_user_page_private($user){
194
+function project_user_page_private($user) {
195 195
     // shown in the private account page
196 196
 }
197 197
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
     array("name" => "Uppercase", "short_name" => "UC", "appids" => array(1, 25)),
259 259
 );
260 260
 
261
-function project_user_credit($user){
261
+function project_user_credit($user) {
262 262
     global $sub_projects;
263 263
     foreach ($sub_projects as $sp) {
264 264
         show_app_credit_user($user, $sp["name"], $sp["appids"]);
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 define('UNIQUE_USER_NAME', true);
51 51
 define("FORUM_QA_MERGED_MODE", true);
52 52
     // Set to true to merge Message boards and Q&A section
53
-define ("DISABLE_PROFILES", true);
53
+define("DISABLE_PROFILES", true);
54 54
     // enable profiles only after enabling reCAPTCHA
55 55
     // https://github.com/BOINC/boinc/wiki/ProtectionFromSpam
56 56
 define("USE_STOPFORUMSPAM", true);
@@ -191,15 +191,15 @@  discard block
 block discarded – undo
191 191
     </ol>", PROJECT);
192 192
 }
193 193
 
194
-function project_workunit($wu){
194
+function project_workunit($wu) {
195 195
     // shown in the workunit page
196 196
 }
197 197
 
198
-function project_user_summary($user){
198
+function project_user_summary($user) {
199 199
     // shown in the user summary page
200 200
 }
201 201
 
202
-function project_user_page_private($user){
202
+function project_user_page_private($user) {
203 203
     // shown in the private account page
204 204
 }
205 205
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
     array("name" => "Uppercase", "short_name" => "UC", "appids" => array(1, 25)),
283 283
 );
284 284
 
285
-function project_user_credit($user){
285
+function project_user_credit($user) {
286 286
     global $sub_projects;
287 287
     foreach ($sub_projects as $sp) {
288 288
         show_app_credit_user($user, $sp["name"], $sp["appids"]);
Please login to merge, or discard this patch.