@@ -34,26 +34,26 @@ |
||
34 | 34 | $intel_gpu_credit_sum = 0; |
35 | 35 | $apple_gpu_scale_sum = 0; |
36 | 36 | $apple_gpu_credit_sum = 0; |
37 | -$total_credit_sum= 0; |
|
37 | +$total_credit_sum = 0; |
|
38 | 38 | |
39 | 39 | $apps = BoincApp::enum("deprecated=0"); |
40 | 40 | foreach ($apps as $app) { |
41 | 41 | $avs = BoincAppVersion::enum("appid=$app->id and deprecated=0"); |
42 | 42 | foreach ($avs as $av) { |
43 | 43 | if (strstr($av->plan_class, "ati")) { |
44 | - $ati_scale_sum += $av->pfc_scale * $av->expavg_credit; |
|
44 | + $ati_scale_sum += $av->pfc_scale*$av->expavg_credit; |
|
45 | 45 | $ati_credit_sum += $av->expavg_credit; |
46 | 46 | } else if (strstr($av->plan_class, "nvidia") || strstr($av->plan_class, "cuda")) { |
47 | - $nvidia_scale_sum += $av->pfc_scale * $av->expavg_credit; |
|
47 | + $nvidia_scale_sum += $av->pfc_scale*$av->expavg_credit; |
|
48 | 48 | $nvidia_credit_sum += $av->expavg_credit; |
49 | 49 | } else if (strstr($av->plan_class, "intel_gpu")) { |
50 | - $intel_gpu_scale_sum += $av->pfc_scale * $av->expavg_credit; |
|
50 | + $intel_gpu_scale_sum += $av->pfc_scale*$av->expavg_credit; |
|
51 | 51 | $intel_gpu_credit_sum += $av->expavg_credit; |
52 | 52 | } else if (strstr($av->plan_class, "apple_gpu")) { |
53 | - $apple_gpu_scale_sum += $av->pfc_scale * $av->expavg_credit; |
|
53 | + $apple_gpu_scale_sum += $av->pfc_scale*$av->expavg_credit; |
|
54 | 54 | $apple_gpu_credit_sum += $av->expavg_credit; |
55 | 55 | } else { |
56 | - $cpu_scale_sum += $av->pfc_scale * $av->expavg_credit; |
|
56 | + $cpu_scale_sum += $av->pfc_scale*$av->expavg_credit; |
|
57 | 57 | $cpu_credit_sum += $av->expavg_credit; |
58 | 58 | } |
59 | 59 | $total_credit_sum += $av->expavg_credit; |
@@ -40,7 +40,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | ?> |
@@ -29,7 +29,7 @@ discard block |
||
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 |
||
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 |
||
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&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 |
||
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 |
||
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 |
||
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]; |
@@ -26,7 +26,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | ?> |
@@ -50,7 +50,7 @@ discard block |
||
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 |
||
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 |
||
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"]); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | if ($notify) { |
39 | 39 | page_head(tra("Request pending")); |
40 | 40 | $t = date_str($friend->create_time); |
41 | - echo tra("You requested friendship with %1 on %2.", $destuser->name,$t) . " |
|
41 | + echo tra("You requested friendship with %1 on %2.", $destuser->name, $t)." |
|
42 | 42 | <p>" . |
43 | 43 | tra("This request is still pending confirmation."); |
44 | 44 | page_tail(); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | function check_ignoring($srcuser, $destuser) { |
52 | 52 | BoincForumPrefs::lookup($destuser); |
53 | 53 | if (is_ignoring($destuser, $srcuser)) { |
54 | - error_page(tra("%1 is not accepting friendship requests from you",$destuser->name)); |
|
54 | + error_page(tra("%1 is not accepting friendship requests from you", $destuser->name)); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | |
@@ -72,11 +72,11 @@ discard block |
||
72 | 72 | echo " |
73 | 73 | <form method=post action=friend.php> |
74 | 74 | <input type=hidden name=userid value=$destid> |
75 | - <input type=hidden name=action value=add_confirm>" . |
|
75 | + <input type=hidden name=action value=add_confirm>". |
|
76 | 76 | tra("You have asked to add %1 as a friend. We will notify %1 and will ask him/her to confirm that you are friends.", |
77 | - "<b>".$destuser->name."</b>") ." |
|
77 | + "<b>".$destuser->name."</b>")." |
|
78 | 78 | <p>" . |
79 | - tra("Add an optional message here:") ." |
|
79 | + tra("Add an optional message here:")." |
|
80 | 80 | <br> |
81 | 81 | ".textarea_with_counter("message", 250, "")." |
82 | 82 | <p> |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | send_friend_request_email($user, $destuser, $msg); |
116 | 116 | } |
117 | 117 | page_head(tra("Friend request sent")); |
118 | - echo tra("We have notified %1 of your request.","<b>".$destuser->name."</b>"); |
|
118 | + echo tra("We have notified %1 of your request.", "<b>".$destuser->name."</b>"); |
|
119 | 119 | page_tail(); |
120 | 120 | } |
121 | 121 | |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | } |
197 | 197 | |
198 | 198 | page_head(tra("Friendship confirmed")); |
199 | - echo tra("Your friendship with %1 has been confirmed.","<b>" . $srcuser->name ."</b>"); |
|
199 | + echo tra("Your friendship with %1 has been confirmed.", "<b>".$srcuser->name."</b>"); |
|
200 | 200 | page_tail(); |
201 | 201 | } |
202 | 202 | |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | $notify->delete(); |
216 | 216 | } |
217 | 217 | page_head(tra("Friendship declined")); |
218 | - echo tra("You have declined friendship with %1","<b>".$srcuser->name."</b>"); |
|
218 | + echo tra("You have declined friendship with %1", "<b>".$srcuser->name."</b>"); |
|
219 | 219 | page_tail(); |
220 | 220 | } |
221 | 221 | |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | echo tra("Notification not found"); |
234 | 234 | } |
235 | 235 | page_head(tra("Friend confirmed")); |
236 | - echo tra("You are now friends with %1.",$destuser->name); |
|
236 | + echo tra("You are now friends with %1.", $destuser->name); |
|
237 | 237 | page_tail(); |
238 | 238 | } |
239 | 239 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | echo |
246 | 246 | tra("Are you sure you want to cancel your friendship with %1?", |
247 | 247 | $destuser->name |
248 | - ) ."<p>\n" |
|
248 | + )."<p>\n" |
|
249 | 249 | ; |
250 | 250 | show_button("friend.php?action=cancel&userid=$destid", tra("Yes"), tra("Cancel friendship")); |
251 | 251 | show_button(HOME_PAGE, tra("No"), tra("Stay friends")); |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | if (!$destuser) error_page("No such user"); |
260 | 260 | BoincFriend::delete($user->id, $destid); |
261 | 261 | page_head(tra("Friendship cancelled")); |
262 | - echo tra("Your friendship with %1 has been cancelled.",$destuser->name); |
|
262 | + echo tra("Your friendship with %1 has been cancelled.", $destuser->name); |
|
263 | 263 | page_tail(); |
264 | 264 | } |
265 | 265 |
@@ -38,9 +38,9 @@ discard block |
||
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 |
||
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 |
||
73 | 73 | <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2."> |
74 | 74 | <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">" |
75 | 75 | ); |
76 | -if (strlen($user->prefs->avatar)){ |
|
76 | +if (strlen($user->prefs->avatar)) { |
|
77 | 77 | row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>", |
78 | 78 | "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">"); |
79 | 79 | } |
80 | 80 | |
81 | -$signature_by_default = $user->prefs->no_signature_by_default==false?"checked=\"checked\"":""; |
|
81 | +$signature_by_default = $user->prefs->no_signature_by_default == false ? "checked=\"checked\"" : ""; |
|
82 | 82 | |
83 | -$signature=$user->prefs->signature; |
|
84 | -$maxlen=250; |
|
83 | +$signature = $user->prefs->signature; |
|
84 | +$maxlen = 250; |
|
85 | 85 | $x = ''; |
86 | 86 | if (!NO_COMPUTING) { |
87 | 87 | $x = tra( |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | tra("Attach signature by default") |
104 | 104 | ) |
105 | 105 | ); |
106 | -if ($user->prefs->signature!=""){ |
|
106 | +if ($user->prefs->signature != "") { |
|
107 | 107 | row2(tra("Signature preview"). |
108 | 108 | "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>", |
109 | 109 | output_transform($user->prefs->signature) |
@@ -112,13 +112,13 @@ discard block |
||
112 | 112 | |
113 | 113 | // ------------ Message display ----------- |
114 | 114 | |
115 | -$forum_hide_avatars = $user->prefs->hide_avatars?"checked=\"checked\"":""; |
|
116 | -$forum_hide_signatures = $user->prefs->hide_signatures?"checked=\"checked\"":""; |
|
117 | -$forum_link_popup = $user->prefs->link_popup?"checked=\"checked\"":""; |
|
118 | -$forum_image_as_link = $user->prefs->images_as_links?"checked=\"checked\"":""; |
|
119 | -$forum_jump_to_unread = $user->prefs->jump_to_unread?"checked=\"checked\"":""; |
|
120 | -$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts?"checked=\"checked\"":""; |
|
121 | -$forum_highlight_special = $user->prefs->highlight_special?"checked=\"checked\"":""; |
|
115 | +$forum_hide_avatars = $user->prefs->hide_avatars ? "checked=\"checked\"" : ""; |
|
116 | +$forum_hide_signatures = $user->prefs->hide_signatures ? "checked=\"checked\"" : ""; |
|
117 | +$forum_link_popup = $user->prefs->link_popup ? "checked=\"checked\"" : ""; |
|
118 | +$forum_image_as_link = $user->prefs->images_as_links ? "checked=\"checked\"" : ""; |
|
119 | +$forum_jump_to_unread = $user->prefs->jump_to_unread ? "checked=\"checked\"" : ""; |
|
120 | +$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts ? "checked=\"checked\"" : ""; |
|
121 | +$forum_highlight_special = $user->prefs->highlight_special ? "checked=\"checked\"" : ""; |
|
122 | 122 | |
123 | 123 | $forum_minimum_wrap_postcount = intval($user->prefs->minimum_wrap_postcount); |
124 | 124 | $forum_display_wrap_postcount = intval($user->prefs->display_wrap_postcount); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | <input class="btn btn-default" type="submit" name="remove%d" value="%s"> |
165 | 165 | <br> |
166 | 166 | ', |
167 | - UNIQUE_USER_NAME?'':"$blocked_user->id -", |
|
167 | + UNIQUE_USER_NAME ? '' : "$blocked_user->id -", |
|
168 | 168 | user_links($blocked_user), |
169 | 169 | $blocked_user->id, |
170 | 170 | tra("Unblock") |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | tra("Blocked users"), |
179 | 179 | tra('Ignore message board posts and private messages from these users.') |
180 | 180 | ), |
181 | - $blocked_str?$blocked_str:'---' |
|
181 | + $blocked_str ? $blocked_str : '---' |
|
182 | 182 | ); |
183 | 183 | row2( |
184 | 184 | tra('Block user'), |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | <input type="text" name="forum_filter_user" size=12> |
189 | 189 | <input class="btn btn-default" type="submit" name="add_user_to_filter" value="%s"> |
190 | 190 | ', |
191 | - UNIQUE_USER_NAME?tra('User name'):tra('User ID (For instance: 123456789)'), |
|
191 | + UNIQUE_USER_NAME ?tra('User name') : tra('User ID (For instance: 123456789)'), |
|
192 | 192 | tra("Block") |
193 | 193 | ) |
194 | 194 | ); |
@@ -206,5 +206,5 @@ discard block |
||
206 | 206 | end_table(); |
207 | 207 | page_tail(); |
208 | 208 | |
209 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
209 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
210 | 210 | ?> |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | mkdir("../cache", 0770); |
33 | 33 | chmod("../cache", 0770); |
34 | 34 | } |
35 | - for ($i=0;$i<256;$i++) { |
|
36 | - $j=sprintf("%02x",$i); |
|
35 | + for ($i = 0; $i < 256; $i++) { |
|
36 | + $j = sprintf("%02x", $i); |
|
37 | 37 | if (!@filemtime("../cache/$j")) { |
38 | 38 | mkdir("../cache/$j", 0770); |
39 | 39 | chmod("../cache/$j", 0770); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | } |
42 | 42 | } |
43 | 43 | |
44 | -function get_path($params, $phpfile=null) { |
|
44 | +function get_path($params, $phpfile = null) { |
|
45 | 45 | if (!@filemtime("../cache/00")) make_cache_dirs(); |
46 | 46 | if ($phpfile) { |
47 | 47 | $z = $phpfile; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | // add a layer of subdirectories for reducing file lookup time |
54 | - $sz = substr(md5($z."_".urlencode($params)),1,2); |
|
54 | + $sz = substr(md5($z."_".urlencode($params)), 1, 2); |
|
55 | 55 | $path = "../cache/".$sz."/".$z; |
56 | 56 | if ($params) { |
57 | 57 | $path = $path."_".urlencode($params); |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | function disk_usage($dir) { |
63 | - $usage=0; |
|
64 | - if ($handle=@opendir($dir)) { |
|
65 | - while ($file=readdir($handle)) { |
|
63 | + $usage = 0; |
|
64 | + if ($handle = @opendir($dir)) { |
|
65 | + while ($file = readdir($handle)) { |
|
66 | 66 | if (($file != ".") && ($file != "..")) { |
67 | 67 | if (@is_dir($dir."/".$file)) { |
68 | - $usage+=disk_usage($dir."/".$file); |
|
68 | + $usage += disk_usage($dir."/".$file); |
|
69 | 69 | } else { |
70 | - $usage+=@filesize($dir."/".$file); |
|
70 | + $usage += @filesize($dir."/".$file); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | } |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | if (!chdir($dir)) { |
82 | 82 | return; |
83 | 83 | } |
84 | - if ($handle=@opendir(".")) { |
|
85 | - while ($file=readdir($handle)) { |
|
84 | + if ($handle = @opendir(".")) { |
|
85 | + while ($file = readdir($handle)) { |
|
86 | 86 | if ($file == ".") continue; |
87 | 87 | if ($file == "..") continue; |
88 | 88 | |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | if (@is_dir($file)) { |
94 | 94 | clean_cache($max_age, $file); |
95 | 95 | } else { |
96 | - if ((time()-@filemtime($file))>$max_age) { |
|
96 | + if ((time() - @filemtime($file)) > $max_age) { |
|
97 | 97 | //echo "unlinking ".getcwd()."/$file\n"; |
98 | 98 | @unlink($file); |
99 | 99 | } |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | |
108 | 108 | // check cache size every once in a while, purge if too big |
109 | 109 | // |
110 | -function cache_check_diskspace(){ |
|
111 | - if ((rand() % CACHE_SIZE_CHECK_FREQ)) return; |
|
110 | +function cache_check_diskspace() { |
|
111 | + if ((rand()%CACHE_SIZE_CHECK_FREQ)) return; |
|
112 | 112 | if (disk_usage("../cache") < MAX_CACHE_USAGE) return; |
113 | 113 | $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL, |
114 | 114 | USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | clean_cache($x, "../cache"); |
117 | 117 | } |
118 | 118 | |
119 | -function cache_need_to_regenerate($path, $max_age){ |
|
119 | +function cache_need_to_regenerate($path, $max_age) { |
|
120 | 120 | $regenerate = false; |
121 | 121 | $request = apache_request_headers(); |
122 | 122 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | // and touch the cached copy so other processes |
129 | 129 | // don't regenerate at the same time |
130 | 130 | // |
131 | - if ($lastmodified<time()-$max_age) { |
|
131 | + if ($lastmodified < time() - $max_age) { |
|
132 | 132 | $regenerate = true; |
133 | 133 | @touch($path); |
134 | 134 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | // Returns cached data or false if nothing was found |
142 | -function get_cached_data($max_age, $params=""){ |
|
142 | +function get_cached_data($max_age, $params = "") { |
|
143 | 143 | global $no_cache; |
144 | 144 | |
145 | 145 | if ($no_cache) return; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | } |
156 | 156 | } else { |
157 | 157 | cache_check_diskspace(); |
158 | - $regenerate=cache_need_to_regenerate($path, $max_age); |
|
158 | + $regenerate = cache_need_to_regenerate($path, $max_age); |
|
159 | 159 | if (!$regenerate) { |
160 | 160 | return file_get_contents($path); |
161 | 161 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | // DEPRECATED |
168 | -function start_cache($max_age, $params=""){ |
|
168 | +function start_cache($max_age, $params = "") { |
|
169 | 169 | global $no_cache, $caching, $memcache; |
170 | 170 | |
171 | 171 | if ($no_cache) return; |
@@ -188,15 +188,15 @@ discard block |
||
188 | 188 | $regenerate = cache_need_to_regenerate($path, $max_age); |
189 | 189 | } |
190 | 190 | //Is the stored version too old, do we need to regenerate it? |
191 | - if ($regenerate){ |
|
191 | + if ($regenerate) { |
|
192 | 192 | // If cached version is too old (or non-existent) |
193 | 193 | // generate the page and write to cache |
194 | 194 | // |
195 | 195 | ob_start(); |
196 | 196 | ob_implicit_flush(0); |
197 | - Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); |
|
198 | - Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT"); |
|
199 | - Header("Cache-Control: public, max-age=" . $max_age); |
|
197 | + Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); |
|
198 | + Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT"); |
|
199 | + Header("Cache-Control: public, max-age=".$max_age); |
|
200 | 200 | |
201 | 201 | // allow the calling page to see cache period |
202 | 202 | // |
@@ -208,9 +208,9 @@ discard block |
||
208 | 208 | if (strstr($params, "format=xml")) { |
209 | 209 | header('Content-type: text/xml'); |
210 | 210 | } |
211 | - Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT"); |
|
212 | - Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT"); |
|
213 | - Header("Cache-Control: public, max-age=" . $max_age ); |
|
211 | + Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT"); |
|
212 | + Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT"); |
|
213 | + Header("Cache-Control: public, max-age=".$max_age); |
|
214 | 214 | if ($cache && $cache->content) { |
215 | 215 | echo $cache->content; |
216 | 216 | exit; |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | |
229 | 229 | // write output buffer both to client and to cache |
230 | 230 | // DEPRECATED |
231 | -function end_cache($max_age,$params=""){ |
|
231 | +function end_cache($max_age, $params = "") { |
|
232 | 232 | global $no_cache; |
233 | 233 | if ($no_cache) return; |
234 | 234 | |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | } |
255 | 255 | |
256 | -function set_cached_data($max_age, $data, $params=""){ |
|
256 | +function set_cached_data($max_age, $data, $params = "") { |
|
257 | 257 | // for the benefit of hackers |
258 | 258 | if (strstr($params, "..")) { |
259 | 259 | return "bad params"; |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | } |
296 | 296 | $server_arr = array(); |
297 | 297 | $servers = explode('|', MEMCACHE_SERVERS); |
298 | - foreach($servers as &$server) { |
|
298 | + foreach ($servers as &$server) { |
|
299 | 299 | list($ip, $port, $weight) = explode(':', $server); |
300 | 300 | if (!$port) { $port = 11211; } |
301 | 301 | $server_arr[] = array($ip, $port, $weight); |
@@ -84,20 +84,20 @@ discard block |
||
84 | 84 | if ($offset === false) $offset = 0; |
85 | 85 | if ($offset >= $nmsgs) $offset = 0; |
86 | 86 | echo sprintf('Showing messages %d to %d of %d', |
87 | - $offset+1, |
|
88 | - min($offset+$nshow, $nmsgs), |
|
87 | + $offset + 1, |
|
88 | + min($offset + $nshow, $nmsgs), |
|
89 | 89 | $nmsgs |
90 | 90 | ); |
91 | 91 | if ($offset) { |
92 | 92 | echo sprintf( |
93 | 93 | ' · <a href=pm.php?action=inbox&offset=%d>Previous %d</a>', |
94 | - max(0, $offset-$nshow), $nshow |
|
94 | + max(0, $offset - $nshow), $nshow |
|
95 | 95 | ); |
96 | 96 | } |
97 | - if ($offset+$nshow < $nmsgs) { |
|
97 | + if ($offset + $nshow < $nmsgs) { |
|
98 | 98 | echo sprintf( |
99 | 99 | ' · <a href=pm.php?action=inbox&offset=%d>Next %d</a>', |
100 | - $offset+$nshow, $nshow |
|
100 | + $offset + $nshow, $nshow |
|
101 | 101 | ); |
102 | 102 | } |
103 | 103 | } |
@@ -112,12 +112,12 @@ discard block |
||
112 | 112 | array('style="width: 12em;"', 'style="width: 10em;"', "") |
113 | 113 | ); |
114 | 114 | $i = 0; |
115 | - foreach($msgs as $msg) { |
|
116 | - if ($i<$offset) { |
|
115 | + foreach ($msgs as $msg) { |
|
116 | + if ($i < $offset) { |
|
117 | 117 | $i++; |
118 | 118 | continue; |
119 | 119 | } |
120 | - if ($i>=$offset+$nshow) break; |
|
120 | + if ($i >= $offset + $nshow) break; |
|
121 | 121 | $i++; |
122 | 122 | $sender = BoincUser::lookup_id($msg->senderid); |
123 | 123 | if (!$sender) { |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | $msgs = BoincPrivateMessage::enum( |
366 | 366 | "userid=$logged_in_user->id" |
367 | 367 | ); |
368 | - foreach($msgs as $msg) { |
|
368 | + foreach ($msgs as $msg) { |
|
369 | 369 | $x = "pm_select_$msg->id"; |
370 | 370 | if (post_str($x, true)) { |
371 | 371 | $msg = BoincPrivateMessage::lookup_id($msg->id); |
@@ -420,5 +420,5 @@ discard block |
||
420 | 420 | error_page(tra("Unknown action")); |
421 | 421 | } |
422 | 422 | |
423 | -$cvs_version_tracker[]="\$Id: pm.php 14077 2007-11-03 04:26:47Z davea $"; |
|
423 | +$cvs_version_tracker[] = "\$Id: pm.php 14077 2007-11-03 04:26:47Z davea $"; |
|
424 | 424 | ?> |