@@ -147,11 +147,11 @@ |
||
147 | 147 | |
148 | 148 | function site_list($sites) { |
149 | 149 | echo "<ul>\n"; |
150 | - for ($i=0; $i<count($sites); $i++) { |
|
150 | + for ($i = 0; $i < count($sites); $i++) { |
|
151 | 151 | $s = $sites[$i]; |
152 | 152 | $url = $s[0]; |
153 | 153 | $name = $s[1]; |
154 | - $comment = array_key_exists(2, $s)?$s[2]:""; |
|
154 | + $comment = array_key_exists(2, $s) ? $s[2] : ""; |
|
155 | 155 | echo "<li><a href=\"$url\">$name</a> $comment\n"; |
156 | 156 | } |
157 | 157 | echo "</ul>\n"; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | return $x; |
52 | 52 | } |
53 | 53 | |
54 | -function pm_team_form($user, $teamid, $error=null) { |
|
54 | +function pm_team_form($user, $teamid, $error = null) { |
|
55 | 55 | global $bbcode_html, $bbcode_js; |
56 | 56 | $team = BoincTeam::lookup_id($teamid); |
57 | 57 | if (!$team) { |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | error_page("not admin"); |
62 | 62 | } |
63 | 63 | |
64 | - page_head(tra("Send message to team"),'','','', $bbcode_js); |
|
64 | + page_head(tra("Send message to team"), '', '', '', $bbcode_js); |
|
65 | 65 | |
66 | 66 | $subject = post_str("subject", true); |
67 | 67 | $content = post_str("content", true); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | function pm_form_page($replyto, $userid, $error = null) { |
114 | 114 | global $bbcode_html, $bbcode_js; |
115 | 115 | global $g_logged_in_user; |
116 | - page_head(tra("Send private message"),'','','', $bbcode_js); |
|
116 | + page_head(tra("Send private message"), '', '', '', $bbcode_js); |
|
117 | 117 | |
118 | 118 | if (post_str("preview", true) == tra("Preview")) { |
119 | 119 | $content = post_str("content", true); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | if (!$user) { |
138 | 138 | error_page("Sender no longer exists"); |
139 | 139 | } |
140 | - $writeto = UNIQUE_USER_NAME?$user->name:$userid." (".$user->name.")"; |
|
140 | + $writeto = UNIQUE_USER_NAME ? $user->name : $userid." (".$user->name.")"; |
|
141 | 141 | $subject = $message->subject; |
142 | 142 | if (substr($subject, 0, 3) != "re:") { |
143 | 143 | $subject = "re: ".$subject; |
@@ -147,15 +147,15 @@ discard block |
||
147 | 147 | if (!$user) { |
148 | 148 | error_page("Sender no longer exists"); |
149 | 149 | } |
150 | - $writeto = UNIQUE_USER_NAME?$user->name:$userid." (".$user->name.")"; |
|
150 | + $writeto = UNIQUE_USER_NAME ? $user->name : $userid." (".$user->name.")"; |
|
151 | 151 | } else { |
152 | 152 | $writeto = sanitize_tags(post_str("to", true)); |
153 | 153 | $subject = post_str("subject", true); |
154 | 154 | $content = post_str("content", true); |
155 | 155 | } |
156 | 156 | |
157 | - $content = $content?htmlspecialchars($content):''; |
|
158 | - $subject = $subject?htmlspecialchars($subject):''; |
|
157 | + $content = $content ?htmlspecialchars($content) : ''; |
|
158 | + $subject = $subject ?htmlspecialchars($subject) : ''; |
|
159 | 159 | |
160 | 160 | if ($error != null) { |
161 | 161 | echo "<p class=\"text-danger\">".$error."</p>\n"; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | function send_pm_notification_email( |
212 | 212 | $logged_in_user, $to_user, $subject, $content |
213 | 213 | ) { |
214 | - $message = " |
|
214 | + $message = " |
|
215 | 215 | You have received a new private message at ".PROJECT.". |
216 | 216 | |
217 | 217 | From: $logged_in_user->name (ID $logged_in_user->id) |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | $pm = BoincPrivateMessage::lookup_id($notify->opaque); |
242 | 242 | $from_user = BoincUser::lookup_id($pm->senderid); |
243 | 243 | if (!$pm || !$from_user) return null; |
244 | - return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject"; |
|
244 | + return "<a href=pm.php>".tra("Private message%1 from %2, subject:", "</a>", $from_user->name)." $pm->subject"; |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | function pm_send_msg($from_user, $to_user, $subject, $content, $send_email) { |
@@ -305,11 +305,11 @@ discard block |
||
305 | 305 | |
306 | 306 | function pm_email_remind($user) { |
307 | 307 | if (!$user->prefs->pm_notification) { |
308 | - return "<br><small>" . |
|
308 | + return "<br><small>". |
|
309 | 309 | tra( |
310 | 310 | "For email notification, %1 edit community prefs %2", |
311 | 311 | '<a href="edit_forum_preferences_form.php">', '</a>' |
312 | - ) . |
|
312 | + ). |
|
313 | 313 | "</small>" |
314 | 314 | ; |
315 | 315 | } |
@@ -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(); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | row2("Created", date_str($team->create_time)); |
96 | 96 | if (defined("SHOW_NONVALIDATED_TEAMS")) { |
97 | 97 | $founder = $team->founder; |
98 | - row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)"); |
|
98 | + row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)"); |
|
99 | 99 | } |
100 | 100 | if (strlen($team->url)) {; |
101 | 101 | if (strstr($team->url, "http://")) { |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | } |
169 | 169 | row1(tra('Members')); |
170 | 170 | row2(tra('Founder'), |
171 | - $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---" |
|
171 | + $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---" |
|
172 | 172 | ); |
173 | 173 | if (count($team->admins)) { |
174 | 174 | $first = true; |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | foreach ($deltas as $delta) { |
356 | 356 | $u = BoincUser::lookup_id($delta->userid); |
357 | 357 | if ($u->teamid == $teamid) { |
358 | - $new_members[] = $u->id; // they might have later quit |
|
358 | + $new_members[] = $u->id; // they might have later quit |
|
359 | 359 | } |
360 | 360 | } |
361 | 361 | return array_unique($new_members); |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | if (!$user->teamid) return; |
439 | 439 | $user->update("teamid=0"); |
440 | 440 | $team = BoincTeam::lookup_id($user->teamid); |
441 | - if ($team && $team->ping_user==$user->id) { |
|
441 | + if ($team && $team->ping_user == $user->id) { |
|
442 | 442 | $team->update("ping_user=-ping_user"); |
443 | 443 | } |
444 | 444 | BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id"); |
@@ -477,33 +477,33 @@ discard block |
||
477 | 477 | start_table(); |
478 | 478 | row2(tra('Team name, text version').' |
479 | 479 | <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>', |
480 | - '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">' |
|
480 | + '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">' |
|
481 | 481 | ); |
482 | 482 | row2(tra('Team name, HTML version').' |
483 | 483 | <br><p class=\"text-muted\"> |
484 | 484 | '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').' |
485 | 485 | '.tra('If you don\'t know HTML, leave this box blank.').'</p>', |
486 | - '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">' |
|
486 | + '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">' |
|
487 | 487 | ); |
488 | 488 | row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').') |
489 | 489 | '.tra('This URL will be linked to from the team\'s page on this site.'), |
490 | - '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">' |
|
490 | + '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">' |
|
491 | 491 | ); |
492 | 492 | row2(tra('Description of team').': |
493 | 493 | <br><p class=\"text-muted\"> |
494 | 494 | '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').' |
495 | 495 | </p>', |
496 | - '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>' |
|
496 | + '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>' |
|
497 | 497 | ); |
498 | 498 | |
499 | - row2(tra('Type of team').':', team_type_select($team?$team->type:null)); |
|
499 | + row2(tra('Type of team').':', team_type_select($team ? $team->type : null)); |
|
500 | 500 | |
501 | 501 | row2_init(tra('Country')); |
502 | 502 | echo '<select class="form-control" name="country">'; |
503 | - echo country_select_options($team?$team->country:null); |
|
503 | + echo country_select_options($team ? $team->country : null); |
|
504 | 504 | echo "</select></td></tr>\n"; |
505 | 505 | |
506 | - $x = (!$team || $team->joinable)?"checked":""; |
|
506 | + $x = (!$team || $team->joinable) ? "checked" : ""; |
|
507 | 507 | row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>"); |
508 | 508 | // Check if we're using reCaptcha to prevent spam accounts |
509 | 509 | // |
@@ -571,12 +571,12 @@ discard block |
||
571 | 571 | // |
572 | 572 | function new_transfer_request_ok($team, $now) { |
573 | 573 | if ($team->ping_user <= 0) { |
574 | - if ($team->ping_time < $now - 60 * 86400) { |
|
574 | + if ($team->ping_time < $now - 60*86400) { |
|
575 | 575 | return true; |
576 | 576 | } |
577 | 577 | return false; |
578 | 578 | } |
579 | - if ($team->ping_time < $now - 90 * 86400) { |
|
579 | + if ($team->ping_time < $now - 90*86400) { |
|
580 | 580 | return true; |
581 | 581 | } |
582 | 582 | return false; |
@@ -611,7 +611,7 @@ discard block |
||
611 | 611 | if (!is_valid_country($country)) { |
612 | 612 | $country = tra('None'); |
613 | 613 | } |
614 | - $country = BoincDb::escape_string($country); // for Cote d'Ivoire |
|
614 | + $country = BoincDb::escape_string($country); // for Cote d'Ivoire |
|
615 | 615 | |
616 | 616 | $clause = sprintf( |
617 | 617 | "(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())", |
@@ -27,25 +27,25 @@ |
||
27 | 27 | row_array(array("Name", "Engine", "Version", "Row Format", "Rows", "Avg Row Length (KB)", "Data Length (MB)", "Max Data Length (MB)", "Index Length (MB)", "Data free (MB)", "Create Time", "Update Time", "Check Time", "Create Options", "Comment")); |
28 | 28 | db_init(); |
29 | 29 | $result = _mysql_query("show table status"); |
30 | - while($row = _mysql_fetch_array($result)) { |
|
30 | + while ($row = _mysql_fetch_array($result)) { |
|
31 | 31 | $size += ($row["Data_length"] + $row["Index_length"]); |
32 | 32 | $engine = $row["Engine"]; |
33 | 33 | //if (!$engine) $engine = $row["Type"]; |
34 | 34 | row_array(array( |
35 | 35 | $row["Name"], |
36 | 36 | $engine, |
37 | - $row["Version"] , |
|
38 | - $row["Row_format"] , |
|
39 | - $row["Rows"] , |
|
40 | - round($row["Avg_row_length"]/1024,2) , |
|
41 | - round($row["Data_length"]/(1024*1024),2) , |
|
42 | - round($row["Max_data_length"]/(1024*1024),2) , |
|
43 | - round($row["Index_length"]/(1024*1024),2) , |
|
44 | - round($row["Data_free"]/(1024*1024),2) , |
|
45 | - $row["Create_time"] , |
|
46 | - $row["Update_time"] , |
|
47 | - $row["Check_time"] , |
|
48 | - $row["Create_options"] , |
|
37 | + $row["Version"], |
|
38 | + $row["Row_format"], |
|
39 | + $row["Rows"], |
|
40 | + round($row["Avg_row_length"]/1024, 2), |
|
41 | + round($row["Data_length"]/(1024*1024), 2), |
|
42 | + round($row["Max_data_length"]/(1024*1024), 2), |
|
43 | + round($row["Index_length"]/(1024*1024), 2), |
|
44 | + round($row["Data_free"]/(1024*1024), 2), |
|
45 | + $row["Create_time"], |
|
46 | + $row["Update_time"], |
|
47 | + $row["Check_time"], |
|
48 | + $row["Create_options"], |
|
49 | 49 | $row["Comment"] |
50 | 50 | )); |
51 | 51 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | require_once("../inc/boinc_db.inc"); |
22 | 22 | require_once("../inc/util.inc"); |
23 | 23 | |
24 | -define('CONSENT_TYPE_ENROLL','ENROLL'); |
|
24 | +define('CONSENT_TYPE_ENROLL', 'ENROLL'); |
|
25 | 25 | |
26 | 26 | function check_termsofuse() { |
27 | 27 | return defined('TERMSOFUSE_FILE') and file_exists(TERMSOFUSE_FILE); |
@@ -32,13 +32,13 @@ discard block |
||
32 | 32 | $source, $ctime = 0 |
33 | 33 | ) { |
34 | 34 | $mys = BoincDb::escape_string($source); |
35 | - if ($ctime==0) { |
|
35 | + if ($ctime == 0) { |
|
36 | 36 | $mytime = $user->create_time; |
37 | 37 | } else { |
38 | 38 | $mytime = $ctime; |
39 | 39 | } |
40 | 40 | return BoincConsent::insert( |
41 | - "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) " . |
|
41 | + "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) ". |
|
42 | 42 | "values($user->id, $consent_type_id, $mytime, $consent_flag, $consent_not_required, '$mys')" |
43 | 43 | ); |
44 | 44 | |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | // The integer is the consent_type_id- the id from consent_type table. |
66 | 66 | // If the boolean is FALSE, the integer returned is -1. |
67 | 67 | // |
68 | -function check_consent_type($name, $checkenabled=TRUE) { |
|
68 | +function check_consent_type($name, $checkenabled = TRUE) { |
|
69 | 69 | $name = BoincDb::escape_string($name); |
70 | 70 | $ct = BoincConsentType::lookup("shortname = '$name'"); |
71 | - if ($ct and ( !$checkenabled or ($ct->enabled)) ) { |
|
71 | + if ($ct and (!$checkenabled or ($ct->enabled))) { |
|
72 | 72 | return array(TRUE, $ct->id); |
73 | 73 | } |
74 | 74 | return array(FALSE, -1); |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | "userid=$user->id AND consent_type_id=$ctid AND consent_flag=1" |
53 | 53 | ); |
54 | 54 | if ($consent_result) { |
55 | - return TRUE; |
|
55 | + return true; |
|
56 | 56 | } |
57 | 57 | } |
58 | - return FALSE; |
|
58 | + return false; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | // Check if a particular consent_type name is available. |
@@ -65,13 +65,13 @@ discard block |
||
65 | 65 | // The integer is the consent_type_id- the id from consent_type table. |
66 | 66 | // If the boolean is FALSE, the integer returned is -1. |
67 | 67 | // |
68 | -function check_consent_type($name, $checkenabled=TRUE) { |
|
68 | +function check_consent_type($name, $checkenabled=true) { |
|
69 | 69 | $name = BoincDb::escape_string($name); |
70 | 70 | $ct = BoincConsentType::lookup("shortname = '$name'"); |
71 | 71 | if ($ct and ( !$checkenabled or ($ct->enabled)) ) { |
72 | - return array(TRUE, $ct->id); |
|
72 | + return array(true, $ct->id); |
|
73 | 73 | } |
74 | - return array(FALSE, -1); |
|
74 | + return array(false, -1); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | // When a user uses the Web site to login, this function checks the |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | // You should have received a copy of the GNU Lesser General Public License |
17 | 17 | // along with BOINC. If not, see <http://www.gnu.org/licenses/>. |
18 | 18 | |
19 | -NOT FINISHED. DON'T USE |
|
19 | +NOT FINISHED.DON'T USE |
|
20 | 20 | |
21 | 21 | require 'openid.php'; |
22 | 22 | include_once("../inc/boinc_db.inc"); |
@@ -26,14 +26,14 @@ discard block |
||
26 | 26 | |
27 | 27 | function show_error($str) { |
28 | 28 | page_head("Can't create account"); |
29 | - echo "$str<br>\n"; |
|
29 | + echo "$str < br > \n"; |
|
30 | 30 | page_tail(); |
31 | 31 | exit(); |
32 | 32 | } |
33 | 33 | |
34 | 34 | try { |
35 | 35 | $openid = new LightOpenID; |
36 | - echo "<pre>"; |
|
36 | + echo " < pre > "; |
|
37 | 37 | if(!$openid->mode) { |
38 | 38 | if(isset($_POST['openid_identifier'])) { |
39 | 39 | $openid->identity = $_POST['openid_identifier']; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $subset = sanitize_tags(get_str("subset")); |
28 | 28 | $venue = sanitize_tags(get_str("venue", true)); |
29 | 29 | $columns = get_int("cols", true); |
30 | -$c = $columns?"&cols=$columns":""; |
|
30 | +$c = $columns ? "&cols=$columns" : ""; |
|
31 | 31 | check_subset($subset); |
32 | 32 | if ($action) { |
33 | 33 | check_tokens($user->authenticator); |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | return file_exists("$d/stop_sched"); |
57 | 57 | } |
58 | 58 | |
59 | -function xml_error($num=-1, $msg=null, $file=null, $line=null) { |
|
59 | +function xml_error($num = -1, $msg = null, $file = null, $line = null) { |
|
60 | 60 | global $xml_outer_tag; |
61 | 61 | if (!$msg) { |
62 | - switch($num) { |
|
62 | + switch ($num) { |
|
63 | 63 | case -112: $msg = "Invalid XML"; break; |
64 | 64 | case -136: $msg = "Not found"; break; |
65 | 65 | case -137: $msg = "Name or email address is not unique"; break; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | // If it's a single-tag element, and it's present, just return the tag |
106 | 106 | // |
107 | 107 | function parse_element($xml, $tag) { |
108 | - $closetag = "</" . substr($tag,1); |
|
108 | + $closetag = "</".substr($tag, 1); |
|
109 | 109 | $x = strstr($xml, $tag); |
110 | 110 | if ($x) { |
111 | 111 | if (strstr($tag, "/>")) return $tag; |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | |
122 | 122 | function parse_next_element($xml, $tag, &$cursor) { |
123 | 123 | $element = null; |
124 | - $closetag = "</" . substr($tag,1); |
|
125 | - $pos = substr($xml,$cursor); |
|
124 | + $closetag = "</".substr($tag, 1); |
|
125 | + $pos = substr($xml, $cursor); |
|
126 | 126 | $x = strstr($pos, $tag); |
127 | 127 | if ($x) { |
128 | 128 | if (strstr($tag, "/>")) return $tag; |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | // whose OSs may have such restrictions. |
223 | 223 | // |
224 | 224 | function is_valid_filename($x) { |
225 | - if (strlen($x)>255) return false; |
|
225 | + if (strlen($x) > 255) return false; |
|
226 | 226 | // \w means A-Za-z0-9_ |
227 | 227 | return preg_match('/^[\w\-.]+$/', $x); |
228 | 228 | } |
@@ -30,6 +30,6 @@ |
||
30 | 30 | if (!$thread) error_page('No such thread'); |
31 | 31 | $logged_in_user = get_logged_in_user(); |
32 | 32 | |
33 | -$posts = get_thread_posts($threadid, 0,true); |
|
33 | +$posts = get_thread_posts($threadid, 0, true); |
|
34 | 34 | header("Location: forum_rate.php?choice=p&post=".$posts[0]->id); |
35 | 35 | ?> |