Passed
Pull Request — master (#5620)
by David
10:01
created
html/inc/team.inc 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
41 41
     row2(
42 42
         tra('Key words').'<br><small>'.tra('Find teams with these words in their names or descriptions').'</small>',
43
-        '<input class="form-control" type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
43
+        '<input class="form-control" type="text" name="keywords" value="'.htmlspecialchars($params->keywords).'">');
44 44
     row2_init(tra('Country'));
45 45
     echo '<select class="form-control" name="country"><option value="" selected>---</option>';
46 46
     $country = $params->country;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     echo country_select_options($country);
49 49
     echo "</select></td></tr>\n";
50 50
     row2(tra('Type of team'), team_type_select($params->type, true));
51
-    $checked = $params->active?"checked":"";
51
+    $checked = $params->active ? "checked" : "";
52 52
     row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
53 53
     row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
54 54
     end_table();
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     row2("Created", date_str($team->create_time));
97 97
     if (defined("SHOW_NONVALIDATED_TEAMS")) {
98 98
         $founder = $team->founder;
99
-        row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
99
+        row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)");
100 100
     }
101 101
     if (strlen($team->url)) {;
102 102
         if (strstr($team->url, "http://")) {
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
     }
170 170
     row1(tra('Members'));
171 171
     row2(tra('Founder'),
172
-        $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
172
+        $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---"
173 173
     );
174 174
     if (count($team->admins)) {
175 175
         $first = true;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
     foreach ($deltas as $delta) {
357 357
         $u = BoincUser::lookup_id($delta->userid);
358 358
         if ($u->teamid == $teamid) {
359
-            $new_members[] = $u->id;  // they might have later quit
359
+            $new_members[] = $u->id; // they might have later quit
360 360
         }
361 361
     }
362 362
     return array_unique($new_members);
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
     if (!$user->teamid) return;
440 440
     $user->update("teamid=0");
441 441
     $team = BoincTeam::lookup_id($user->teamid);
442
-    if ($team && $team->ping_user==$user->id) {
442
+    if ($team && $team->ping_user == $user->id) {
443 443
         $team->update("ping_user=-ping_user");
444 444
     }
445 445
     BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id");
@@ -478,33 +478,33 @@  discard block
 block discarded – undo
478 478
     start_table();
479 479
     row2(tra('Team name, text version').'
480 480
         <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
481
-        '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">'
481
+        '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">'
482 482
     );
483 483
     row2(tra('Team name, HTML version').'
484 484
         <br><p class=\"text-muted\">
485 485
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
486 486
         '.tra('If you don\'t know HTML, leave this box blank.').'</p>',
487
-        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">'
487
+        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">'
488 488
     );
489 489
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
490 490
         '.tra('This URL will be linked to from the team\'s page on this site.'),
491
-        '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">'
491
+        '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">'
492 492
     );
493 493
     row2(tra('Description of team').':
494 494
         <br><p class=\"text-muted\">
495 495
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
496 496
         </p>',
497
-        '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>'
497
+        '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>'
498 498
     );
499 499
 
500
-    row2(tra('Type of team').':', team_type_select($team?$team->type:null));
500
+    row2(tra('Type of team').':', team_type_select($team ? $team->type : null));
501 501
 
502 502
     row2_init(tra('Country'));
503 503
     echo '<select class="form-control" name="country">';
504
-    echo country_select_options($team?$team->country:null);
504
+    echo country_select_options($team ? $team->country : null);
505 505
     echo "</select></td></tr>\n";
506 506
 
507
-    $x = (!$team || $team->joinable)?"checked":"";
507
+    $x = (!$team || $team->joinable) ? "checked" : "";
508 508
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
509 509
     // Check if we're using reCaptcha to prevent spam accounts
510 510
     //
@@ -568,12 +568,12 @@  discard block
 block discarded – undo
568 568
 //
569 569
 function new_transfer_request_ok($team, $now) {
570 570
     if ($team->ping_user <= 0) {
571
-        if ($team->ping_time < $now - 60 * 86400) {
571
+        if ($team->ping_time < $now - 60*86400) {
572 572
             return true;
573 573
         }
574 574
         return false;
575 575
     }
576
-    if ($team->ping_time < $now - 90 * 86400) {
576
+    if ($team->ping_time < $now - 90*86400) {
577 577
         return true;
578 578
     }
579 579
     return false;
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
608 608
     if (!is_valid_country($country)) {
609 609
         $country = tra('None');
610 610
     }
611
-    $country = BoincDb::escape_string($country);  // for Cote d'Ivoire
611
+    $country = BoincDb::escape_string($country); // for Cote d'Ivoire
612 612
 
613 613
     $clause = sprintf(
614 614
         "(userid, create_time, name, name_lc, url, type, name_html, description, country, nusers, expavg_time) values(%d, %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, unix_timestamp())",
@@ -631,6 +631,6 @@  discard block
 block discarded – undo
631 631
     }
632 632
 }
633 633
 
634
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
634
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
635 635
 
636 636
 ?>
Please login to merge, or discard this patch.
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
Spacing   +21 added lines, -21 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
 row2(
86 86
     tra("Signature for message board posts")
87 87
     .bbcode_info()
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     textarea_with_counter("signature", 250, $signature)
93 93
     ."<br><input type=\"checkbox\" name=\"signature_by_default\" ".$signature_by_default."> ".tra("Attach signature by default")
94 94
 );
95
-if ($user->prefs->signature!=""){
95
+if ($user->prefs->signature != "") {
96 96
     row2(tra("Signature preview").
97 97
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
98 98
         output_transform($user->prefs->signature)
@@ -101,13 +101,13 @@  discard block
 block discarded – undo
101 101
 
102 102
 // ------------ Message display  -----------
103 103
 
104
-$forum_hide_avatars = $user->prefs->hide_avatars?"checked=\"checked\"":"";
105
-$forum_hide_signatures = $user->prefs->hide_signatures?"checked=\"checked\"":"";
106
-$forum_link_popup = $user->prefs->link_popup?"checked=\"checked\"":"";
107
-$forum_image_as_link = $user->prefs->images_as_links?"checked=\"checked\"":"";
108
-$forum_jump_to_unread = $user->prefs->jump_to_unread?"checked=\"checked\"":"";
109
-$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts?"checked=\"checked\"":"";
110
-$forum_highlight_special = $user->prefs->highlight_special?"checked=\"checked\"":"";
104
+$forum_hide_avatars = $user->prefs->hide_avatars ? "checked=\"checked\"" : "";
105
+$forum_hide_signatures = $user->prefs->hide_signatures ? "checked=\"checked\"" : "";
106
+$forum_link_popup = $user->prefs->link_popup ? "checked=\"checked\"" : "";
107
+$forum_image_as_link = $user->prefs->images_as_links ? "checked=\"checked\"" : "";
108
+$forum_jump_to_unread = $user->prefs->jump_to_unread ? "checked=\"checked\"" : "";
109
+$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts ? "checked=\"checked\"" : "";
110
+$forum_highlight_special = $user->prefs->highlight_special ? "checked=\"checked\"" : "";
111 111
 
112 112
 $forum_minimum_wrap_postcount = intval($user->prefs->minimum_wrap_postcount);
113 113
 $forum_display_wrap_postcount = intval($user->prefs->display_wrap_postcount);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 //
141 141
 $filtered_userlist = get_ignored_list($user);
142 142
 $forum_filtered_userlist = "";
143
-for ($i=0; $i<sizeof($filtered_userlist); $i++){
143
+for ($i = 0; $i < sizeof($filtered_userlist); $i++) {
144 144
     $id = (int)$filtered_userlist[$i];
145 145
     if ($id) {
146 146
         $filtered_user = BoincUser::lookup_id($id);
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
                 <input class="btn btn-default" type="submit" name="remove%d" value="%s">
155 155
                 <br>
156 156
             ',
157
-            UNIQUE_USER_NAME?'':"$filtered_user->id -",
157
+            UNIQUE_USER_NAME ? '' : "$filtered_user->id -",
158 158
             user_links($filtered_user),
159 159
             $filtered_user->id,
160 160
             tra("Unblock")
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
             <input type="text" name="forum_filter_user" size=12>
179 179
             <input class="btn btn-default" type="submit" name="add_user_to_filter" value="%s">
180 180
         ',
181
-        UNIQUE_USER_NAME?tra('User name'):tra('User ID (For instance: 123456789)'),
181
+        UNIQUE_USER_NAME ?tra('User name') : tra('User ID (For instance: 123456789)'),
182 182
         tra("Block")
183 183
     )
184 184
 );
@@ -193,5 +193,5 @@  discard block
 block discarded – undo
193 193
 end_table();
194 194
 page_tail();
195 195
 
196
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
196
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
197 197
 ?>
Please login to merge, or discard this patch.
Braces   +6 added lines, -5 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
 }
@@ -92,7 +93,7 @@  discard block
 block discarded – undo
92 93
     textarea_with_counter("signature", 250, $signature)
93 94
     ."<br><input type=\"checkbox\" name=\"signature_by_default\" ".$signature_by_default."> ".tra("Attach signature by default")
94 95
 );
95
-if ($user->prefs->signature!=""){
96
+if ($user->prefs->signature!="") {
96 97
     row2(tra("Signature preview").
97 98
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
98 99
         output_transform($user->prefs->signature)
@@ -140,7 +141,7 @@  discard block
 block discarded – undo
140 141
 //
141 142
 $filtered_userlist = get_ignored_list($user);
142 143
 $forum_filtered_userlist = "";
143
-for ($i=0; $i<sizeof($filtered_userlist); $i++){
144
+for ($i=0; $i<sizeof($filtered_userlist); $i++) {
144 145
     $id = (int)$filtered_userlist[$i];
145 146
     if ($id) {
146 147
         $filtered_user = BoincUser::lookup_id($id);
Please login to merge, or discard this patch.
html/user/user_search.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     $y = [];
27 27
     $x[] = sprintf('%s%s',
28 28
         user_links($user, BADGE_HEIGHT_MEDIUM),
29
-        UNIQUE_USER_NAME?'':" (ID $user->id)"
29
+        UNIQUE_USER_NAME ? '' : " (ID $user->id)"
30 30
     );
31 31
     $y[] = null;
32 32
     if (!DISABLE_TEAMS) {
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     $where = "true";
105 105
     $search_string = get_str('search_string');
106 106
     if (strlen($search_string)) {
107
-        if (strlen($search_string)<3) {
107
+        if (strlen($search_string) < 3) {
108 108
             error_page(tra("search string must be at least 3 characters"));
109 109
         }
110 110
         $s = BoincDb::escape_string($search_string);
@@ -136,17 +136,17 @@  discard block
 block discarded – undo
136 136
     $search_type = get_str('search_type', true);
137 137
     $order_clause = "id desc";
138 138
     if ($search_type == 'rac') {
139
-        $order_clause ="expavg_credit desc";
139
+        $order_clause = "expavg_credit desc";
140 140
     } else if ($search_type == 'total') {
141
-        $order_clause ="total_credit desc";
141
+        $order_clause = "total_credit desc";
142 142
     }
143 143
 
144 144
     $fields = "id, create_time, name, country, total_credit, expavg_credit, teamid, url, has_profile, donated";
145 145
     $users = BoincUser::enum_fields($fields, $where, "order by $order_clause limit 100");
146 146
     page_head(tra("User search results"));
147
-    $n=0;
147
+    $n = 0;
148 148
     foreach ($users as $user) {
149
-        if ($n==0) {
149
+        if ($n == 0) {
150 150
             start_table('table-striped');
151 151
             $x = ['Name'];
152 152
             $y = [null];
@@ -183,5 +183,5 @@  discard block
 block discarded – undo
183 183
     user_search_form();
184 184
 }
185 185
 
186
-$cvs_version_tracker[]="\$Id: user_search.php 13586 2007-09-13 09:46:36Z Rytis $";  //Generated automatically - do not edit
186
+$cvs_version_tracker[] = "\$Id: user_search.php 13586 2007-09-13 09:46:36Z Rytis $"; //Generated automatically - do not edit
187 187
 ?>
Please login to merge, or discard this patch.