@@ -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; |
@@ -156,15 +156,15 @@ discard block |
||
| 156 | 156 | time_str($user->prefs->banished_until) |
| 157 | 157 | ); |
| 158 | 158 | } |
| 159 | - $writeto = UNIQUE_USER_NAME?$user->name:$userid." (".$user->name.")"; |
|
| 159 | + $writeto = UNIQUE_USER_NAME ? $user->name : $userid." (".$user->name.")"; |
|
| 160 | 160 | } else { |
| 161 | 161 | $writeto = sanitize_tags(post_str("to", true)); |
| 162 | 162 | $subject = post_str("subject", true); |
| 163 | 163 | $content = post_str("content", true); |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - $content = $content?htmlspecialchars($content):''; |
|
| 167 | - $subject = $subject?htmlspecialchars($subject):''; |
|
| 166 | + $content = $content ?htmlspecialchars($content) : ''; |
|
| 167 | + $subject = $subject ?htmlspecialchars($subject) : ''; |
|
| 168 | 168 | |
| 169 | 169 | if ($error != null) { |
| 170 | 170 | echo "<p class=\"text-danger\">".$error."</p>\n"; |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | function send_pm_notification_email( |
| 221 | 221 | $logged_in_user, $to_user, $subject, $content |
| 222 | 222 | ) { |
| 223 | - $message = " |
|
| 223 | + $message = " |
|
| 224 | 224 | You have received a new private message at ".PROJECT.". |
| 225 | 225 | |
| 226 | 226 | From: $logged_in_user->name (ID $logged_in_user->id) |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | $pm = BoincPrivateMessage::lookup_id($notify->opaque); |
| 251 | 251 | $from_user = BoincUser::lookup_id($pm->senderid); |
| 252 | 252 | if (!$pm || !$from_user) return null; |
| 253 | - return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject"; |
|
| 253 | + return "<a href=pm.php>".tra("Private message%1 from %2, subject:", "</a>", $from_user->name)." $pm->subject"; |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | function pm_send_msg($from_user, $to_user, $subject, $content, $send_email) { |
@@ -314,11 +314,11 @@ discard block |
||
| 314 | 314 | |
| 315 | 315 | function pm_email_remind($user) { |
| 316 | 316 | if (!$user->prefs->pm_notification) { |
| 317 | - return "<br><small>" . |
|
| 317 | + return "<br><small>". |
|
| 318 | 318 | tra( |
| 319 | 319 | "For email notification, %1 edit community prefs %2", |
| 320 | 320 | '<a href="edit_forum_preferences_form.php">', '</a>' |
| 321 | - ) . |
|
| 321 | + ). |
|
| 322 | 322 | "</small>" |
| 323 | 323 | ; |
| 324 | 324 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | page_tail(); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | -function list_files($user, $notice=null) { |
|
| 87 | +function list_files($user, $notice = null) { |
|
| 88 | 88 | $dir = sandbox_dir($user); |
| 89 | 89 | if (!is_dir($dir)) error_page("Can't open sandbox directory"); |
| 90 | 90 | page_head("File sandbox"); |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $notice = ""; |
| 169 | 169 | $dir = sandbox_dir($user); |
| 170 | 170 | $count = count($_FILES['new_file']['tmp_name']); |
| 171 | - for ($i=0; $i<$count; $i++) { |
|
| 171 | + for ($i = 0; $i < $count; $i++) { |
|
| 172 | 172 | $tmp_name = $_FILES['new_file']['tmp_name'][$i]; |
| 173 | 173 | if (!is_uploaded_file($tmp_name)) { |
| 174 | 174 | error_page("$tmp_name is not uploaded file"); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | function get_file($user) { |
| 217 | 217 | $dir = sandbox_dir($user); |
| 218 | 218 | $url = post_str('url'); |
| 219 | - if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) { |
|
| 219 | + if (filter_var($url, FILTER_VALIDATE_URL) === false) { |
|
| 220 | 220 | error_page('Not a valid URL'); |
| 221 | 221 | } |
| 222 | 222 | $fname = basename($url); |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | } |
| 226 | 226 | $path = "$dir/$fname"; |
| 227 | 227 | if (file_exists($path)) { |
| 228 | - error_page("File $fname exists; delete it first."); |
|
| 228 | + error_page("file $fname exists; delete it first."); |
|
| 229 | 229 | } |
| 230 | 230 | copy($url, $path); |
| 231 | 231 | $notice = "Fetched file from <strong>$url</strong><br/>"; |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | $desc->long_name, |
| 38 | 38 | $desc->description, |
| 39 | 39 | kw_array_to_str($desc->sci_kw), |
| 40 | - empty($desc->url)?'':"<a href=$desc->url>View</a>", |
|
| 40 | + empty($desc->url) ? '' : "<a href=$desc->url>View</a>", |
|
| 41 | 41 | 'Yes' |
| 42 | 42 | ); |
| 43 | 43 | } |
@@ -210,7 +210,7 @@ |
||
| 210 | 210 | ]; |
| 211 | 211 | } else { |
| 212 | 212 | $x[] = [ |
| 213 | - "Manage $app->name", |
|
| 213 | + "manage $app->name", |
|
| 214 | 214 | "manage_project.php" |
| 215 | 215 | ]; |
| 216 | 216 | } |
@@ -141,12 +141,12 @@ discard block |
||
| 141 | 141 | // prefix for links; needed for pages not in top dir |
| 142 | 142 | $user, |
| 143 | 143 | // logged-in user, if any |
| 144 | - $fixed=false, |
|
| 144 | + $fixed = false, |
|
| 145 | 145 | // if true, navbar is fixed at top of page. |
| 146 | 146 | // NOTE: if you do this, you must set a global var $fixed_navbar |
| 147 | 147 | // to true at compile time |
| 148 | 148 | // (it needs to be set when page_head() is called). |
| 149 | - $inverse=false |
|
| 149 | + $inverse = false |
|
| 150 | 150 | // white on black? |
| 151 | 151 | ) { |
| 152 | 152 | $master_url = master_url(); |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | // output a panel. |
| 247 | 247 | // $content_func is a function that generates the panel contents |
| 248 | 248 | // |
| 249 | -function panel($title, $content_func, $class="panel-primary", $body_class="") { |
|
| 249 | +function panel($title, $content_func, $class = "panel-primary", $body_class = "") { |
|
| 250 | 250 | echo sprintf('<div class="panel %s"> |
| 251 | 251 | ', $class |
| 252 | 252 | ); |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | // $left_width is the width of left column in 1/12 units. |
| 274 | 274 | // $arg is passed to the functions. |
| 275 | 275 | // |
| 276 | -function grid($top_func, $left_func, $right_func, $left_width=6, $arg=null) { |
|
| 276 | +function grid($top_func, $left_func, $right_func, $left_width = 6, $arg = null) { |
|
| 277 | 277 | echo ' |
| 278 | 278 | <div class="container-fluid"> |
| 279 | 279 | '; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | </div> |
| 289 | 289 | '; |
| 290 | 290 | } |
| 291 | - $right_width = 12-$left_width; |
|
| 291 | + $right_width = 12 - $left_width; |
|
| 292 | 292 | echo ' |
| 293 | 293 | <div class="row"> |
| 294 | 294 | <div class="col-sm-'.$left_width.'"> |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | // use extra = "name=x" |
| 313 | 313 | // call forum_focus(x, foo) after defining the field |
| 314 | 314 | // |
| 315 | -function form_start($action, $method='get', $extra='') { |
|
| 315 | +function form_start($action, $method = 'get', $extra = '') { |
|
| 316 | 316 | echo sprintf( |
| 317 | 317 | '<div class="container-fluid"> |
| 318 | 318 | <form class="form-horizontal" method="%s" action="%s" %s>' |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | // just the input field |
| 347 | 347 | // |
| 348 | 348 | function form_input_text_field( |
| 349 | - $name, $value='', $type='text', $attrs='', $extra='' |
|
| 349 | + $name, $value = '', $type = 'text', $attrs = '', $extra = '' |
|
| 350 | 350 | ) { |
| 351 | 351 | return sprintf( |
| 352 | 352 | '<input %s type="%s" class="form-control" name="%s" value="%s">%s', |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | // the whole row |
| 358 | 358 | // |
| 359 | 359 | function form_input_text( |
| 360 | - $label, $name, $value='', $type='text', $attrs='', $extra='' |
|
| 360 | + $label, $name, $value = '', $type = 'text', $attrs = '', $extra = '' |
|
| 361 | 361 | ) { |
| 362 | 362 | echo sprintf(' |
| 363 | 363 | <div class="form-group"> |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | ); |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | -function form_input_textarea($label, $name, $value='', $nrows=4) { |
|
| 388 | +function form_input_textarea($label, $name, $value = '', $nrows = 4) { |
|
| 389 | 389 | echo sprintf(' |
| 390 | 390 | <div class="form-group"> |
| 391 | 391 | <label align=right class="%s" for="%s">%s</label> |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | // $items is either a string of <option> elements, |
| 403 | 403 | // or an array of [value, name] pairs |
| 404 | 404 | // |
| 405 | -function form_select($label, $name, $items, $selected=null) { |
|
| 405 | +function form_select($label, $name, $items, $selected = null) { |
|
| 406 | 406 | echo sprintf(' |
| 407 | 407 | <div class="form-group"> |
| 408 | 408 | <label align=right class="%s" for="%s">%s</label> |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | foreach ($items as $i) { |
| 416 | 416 | echo sprintf( |
| 417 | 417 | '<option %s value="%s">%s</option>', |
| 418 | - ($i[0]==$selected)?'selected':'', |
|
| 418 | + ($i[0] == $selected) ? 'selected' : '', |
|
| 419 | 419 | $i[0], $i[1] |
| 420 | 420 | ); |
| 421 | 421 | } |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | // same, for multiple select. |
| 429 | 429 | // $selected, if non-null, is a list of selected values |
| 430 | 430 | // |
| 431 | -function form_select_multiple($label, $name, $items, $selected=null, $size=0) { |
|
| 431 | +function form_select_multiple($label, $name, $items, $selected = null, $size = 0) { |
|
| 432 | 432 | echo sprintf(' |
| 433 | 433 | <div class="form-group"> |
| 434 | 434 | <label align=right class="%s" for="%s">%s</label> |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | foreach ($items as $i) { |
| 441 | 441 | echo sprintf( |
| 442 | 442 | '<option %s value="%s">%s</option>', |
| 443 | - ($selected && in_array($i[0], $selected))?'selected':'', |
|
| 443 | + ($selected && in_array($i[0], $selected)) ? 'selected' : '', |
|
| 444 | 444 | $i[0], $i[1] |
| 445 | 445 | ); |
| 446 | 446 | } |
@@ -449,12 +449,12 @@ discard block |
||
| 449 | 449 | |
| 450 | 450 | // return a list of strings for checkbox items |
| 451 | 451 | // |
| 452 | -function checkbox_item_strings($items, $attrs='') { |
|
| 452 | +function checkbox_item_strings($items, $attrs = '') { |
|
| 453 | 453 | $x = []; |
| 454 | 454 | foreach ($items as $i) { |
| 455 | 455 | $x[] = sprintf('<input %s type="checkbox" name="%s" %s> %s |
| 456 | 456 | ', |
| 457 | - $attrs, $i[0], $i[2]?"checked":"", $i[1] |
|
| 457 | + $attrs, $i[0], $i[2] ? "checked" : "", $i[1] |
|
| 458 | 458 | ); |
| 459 | 459 | } |
| 460 | 460 | return $x; |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | |
| 463 | 463 | // $items is list of (name, label, checked) |
| 464 | 464 | // |
| 465 | -function form_checkboxes($label, $items, $attrs='') { |
|
| 465 | +function form_checkboxes($label, $items, $attrs = '') { |
|
| 466 | 466 | echo sprintf(' |
| 467 | 467 | <div class="form-group"> |
| 468 | 468 | <label align=right class="%s">%s</label> |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | // |
| 482 | 482 | function form_radio_buttons( |
| 483 | 483 | $label, $name, $items, $selected, |
| 484 | - $assign_ids=false // assign IDs to buttons based on names |
|
| 484 | + $assign_ids = false // assign IDs to buttons based on names |
|
| 485 | 485 | ) { |
| 486 | 486 | echo sprintf(' |
| 487 | 487 | <div class="form-group"> |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS |
| 492 | 492 | ); |
| 493 | 493 | foreach ($items as $i) { |
| 494 | - $checked = ($selected == $i[0])?"checked":""; |
|
| 494 | + $checked = ($selected == $i[0]) ? "checked" : ""; |
|
| 495 | 495 | if ($assign_ids) { |
| 496 | 496 | $id = sprintf('id="%s_%s"', $name, $i[0]); |
| 497 | 497 | } else { |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | '; |
| 530 | 530 | } |
| 531 | 531 | |
| 532 | -function form_submit($text, $attrs='') { |
|
| 532 | +function form_submit($text, $attrs = '') { |
|
| 533 | 533 | form_general( |
| 534 | 534 | "", |
| 535 | 535 | sprintf( |
@@ -539,7 +539,7 @@ discard block |
||
| 539 | 539 | ); |
| 540 | 540 | } |
| 541 | 541 | |
| 542 | -function form_checkbox($label, $name, $checked=false) { |
|
| 542 | +function form_checkbox($label, $name, $checked = false) { |
|
| 543 | 543 | echo sprintf(' |
| 544 | 544 | <div class="form-group"> |
| 545 | 545 | <label align=right class="%s">%s</label> |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | <input type="checkbox" name="%s" %s> |
| 552 | 552 | </div> |
| 553 | 553 | </div> |
| 554 | - ', $name, $checked?"checked":"" |
|
| 554 | + ', $name, $checked ? "checked" : "" |
|
| 555 | 555 | ); |
| 556 | 556 | } |
| 557 | 557 | |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | // $selected is the list of selected values. |
| 580 | 580 | // $extra is e.g. id=foo |
| 581 | 581 | // |
| 582 | -function form_select2_multi($label, $name, $items, $selected=null, $extra='') { |
|
| 582 | +function form_select2_multi($label, $name, $items, $selected = null, $extra = '') { |
|
| 583 | 583 | echo sprintf(' |
| 584 | 584 | <div class="form-group"> |
| 585 | 585 | <label align=right class="%s" for="%s">%s</label> |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | foreach ($items as $i) { |
| 592 | 592 | echo sprintf( |
| 593 | 593 | '<option %s value="%s">%s</option>', |
| 594 | - ($selected && in_array($i[0], $selected))?'selected':'', |
|
| 594 | + ($selected && in_array($i[0], $selected)) ? 'selected' : '', |
|
| 595 | 595 | $i[0], $i[1] |
| 596 | 596 | ); |
| 597 | 597 | } |
@@ -362,12 +362,12 @@ |
||
| 362 | 362 | $db = BoincDb::get(); |
| 363 | 363 | return $db->enum('result', 'BoincResult', $where_clause); |
| 364 | 364 | } |
| 365 | - static function enum_fields($fields, $where_clause, $order_clause=null) { |
|
| 365 | + static function enum_fields($fields, $where_clause, $order_clause=null) { |
|
| 366 | 366 | $db = BoincDb::get(); |
| 367 | - return $db->enum_fields( |
|
| 367 | + return $db->enum_fields( |
|
| 368 | 368 | 'result', 'BoincResult', $fields, $where_clause, $order_clause |
| 369 | 369 | ); |
| 370 | - } |
|
| 370 | + } |
|
| 371 | 371 | function update($clause) { |
| 372 | 372 | $db = BoincDb::get(); |
| 373 | 373 | return $db->update($this, 'result', $clause); |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | // close() closes the connection. |
| 45 | 45 | |
| 46 | 46 | class BoincDb { |
| 47 | - static $instance; // a DbConn object, or null |
|
| 48 | - static $dbnum; // which replica we're connected to |
|
| 47 | + static $instance; // a DbConn object, or null |
|
| 48 | + static $dbnum; // which replica we're connected to |
|
| 49 | 49 | |
| 50 | 50 | // connect to DB $dbnum (0, 1, ...) |
| 51 | 51 | // If the requested DB doesn't exist or connection fails, connect to DB 0. |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | self::$instance = null; |
| 57 | 57 | $config = get_config(); |
| 58 | 58 | if ($dbnum) { |
| 59 | - $r = $dbnum==1?'':strval($dbnum); |
|
| 59 | + $r = $dbnum == 1 ? '' : strval($dbnum); |
|
| 60 | 60 | $host = parse_config($config, sprintf('<replica%s_db_host>', $r)); |
| 61 | 61 | $name = parse_config($config, sprintf('<replica%s_db_name>', $r)); |
| 62 | 62 | $user = parse_config($config, sprintf('<replica%s_db_user>', $r)); |
@@ -204,11 +204,11 @@ discard block |
||
| 204 | 204 | $db = BoincDb::get(); |
| 205 | 205 | return $db->update($this, 'user', $clause); |
| 206 | 206 | } |
| 207 | - static function enum($where_clause, $order_clause=null) { |
|
| 207 | + static function enum($where_clause, $order_clause = null) { |
|
| 208 | 208 | $db = BoincDb::get(); |
| 209 | 209 | return $db->enum('user', 'BoincUser', $where_clause, $order_clause); |
| 210 | 210 | } |
| 211 | - static function enum_fields($fields, $where_clause, $order_clause=null) { |
|
| 211 | + static function enum_fields($fields, $where_clause, $order_clause = null) { |
|
| 212 | 212 | $db = BoincDb::get(); |
| 213 | 213 | return $db->enum_fields( |
| 214 | 214 | 'user', 'BoincUser', $fields, $where_clause, $order_clause |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | $db = BoincDb::get(); |
| 259 | 259 | return $db->update($this, 'team', $clause); |
| 260 | 260 | } |
| 261 | - static function enum($where_clause, $order_clause=null) { |
|
| 261 | + static function enum($where_clause, $order_clause = null) { |
|
| 262 | 262 | $db = BoincDb::get(); |
| 263 | 263 | return $db->enum('team', 'BoincTeam', $where_clause, $order_clause); |
| 264 | 264 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | $db = BoincDb::get(); |
| 284 | 284 | return $db->max('team', $field); |
| 285 | 285 | } |
| 286 | - static function enum_fields($fields, $where_clause, $order_clause=null) { |
|
| 286 | + static function enum_fields($fields, $where_clause, $order_clause = null) { |
|
| 287 | 287 | $db = BoincDb::get(); |
| 288 | 288 | return $db->enum_fields( |
| 289 | 289 | 'team', 'BoincTeam', $fields, $where_clause, $order_clause |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | $db = BoincDb::get(); |
| 318 | 318 | return $db->update($this, 'host', $clause); |
| 319 | 319 | } |
| 320 | - static function update_aux($clause, $where='') { |
|
| 320 | + static function update_aux($clause, $where = '') { |
|
| 321 | 321 | $db = BoincDb::get(); |
| 322 | 322 | return $db->update_aux('host', $clause, $where); |
| 323 | 323 | } |
@@ -325,11 +325,11 @@ discard block |
||
| 325 | 325 | $db = BoincDb::get(); |
| 326 | 326 | return $db->delete($this, 'host'); |
| 327 | 327 | } |
| 328 | - static function enum($where_clause, $order_clause=null) { |
|
| 328 | + static function enum($where_clause, $order_clause = null) { |
|
| 329 | 329 | $db = BoincDb::get(); |
| 330 | 330 | return $db->enum('host', 'BoincHost', $where_clause, $order_clause); |
| 331 | 331 | } |
| 332 | - static function enum_fields($fields, $where_clause, $order_clause=null) { |
|
| 332 | + static function enum_fields($fields, $where_clause, $order_clause = null) { |
|
| 333 | 333 | $db = BoincDb::get(); |
| 334 | 334 | return $db->enum_fields( |
| 335 | 335 | 'host', 'BoincHost', $fields, $where_clause, $order_clause |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $db = BoincDb::get(); |
| 367 | 367 | return $db->enum('result', 'BoincResult', $where_clause); |
| 368 | 368 | } |
| 369 | - static function enum_fields($fields, $where_clause, $order_clause=null) { |
|
| 369 | + static function enum_fields($fields, $where_clause, $order_clause = null) { |
|
| 370 | 370 | $db = BoincDb::get(); |
| 371 | 371 | return $db->enum_fields( |
| 372 | 372 | 'result', 'BoincResult', $fields, $where_clause, $order_clause |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | $db = BoincDb::get(); |
| 377 | 377 | return $db->update($this, 'result', $clause); |
| 378 | 378 | } |
| 379 | - static function update_aux($clause, $where='') { |
|
| 379 | + static function update_aux($clause, $where = '') { |
|
| 380 | 380 | $db = BoincDb::get(); |
| 381 | 381 | return $db->update_aux('result', $clause, $where); |
| 382 | 382 | } |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | $db = BoincDb::get(); |
| 416 | 416 | return $db->enum('workunit', 'BoincWorkunit', $where_clause); |
| 417 | 417 | } |
| 418 | - static function enum_fields($fields, $where_clause, $order_clause=null) { |
|
| 418 | + static function enum_fields($fields, $where_clause, $order_clause = null) { |
|
| 419 | 419 | $db = BoincDb::get(); |
| 420 | 420 | return $db->enum_fields('workunit', 'BoincWorkunit', $fields, $where_clause, $order_clause); |
| 421 | 421 | } |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | $db = BoincDb::get(); |
| 424 | 424 | return $db->update($this, 'workunit', $clause); |
| 425 | 425 | } |
| 426 | - static function update_aux($clause, $where='') { |
|
| 426 | + static function update_aux($clause, $where = '') { |
|
| 427 | 427 | $db = BoincDb::get(); |
| 428 | 428 | return $db->update_aux('workunit', $clause, $where); |
| 429 | 429 | } |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | $db = BoincDb::get(); |
| 458 | 458 | return $db->update($this, 'app', $clause); |
| 459 | 459 | } |
| 460 | - static function sum($field, $clause=null) { |
|
| 460 | + static function sum($field, $clause = null) { |
|
| 461 | 461 | $db = BoincDb::get(); |
| 462 | 462 | return $db->sum('app', $field, $clause); |
| 463 | 463 | } |
@@ -515,11 +515,11 @@ discard block |
||
| 515 | 515 | $db = BoincDb::get(); |
| 516 | 516 | return $db->insert('profile', $clause); |
| 517 | 517 | } |
| 518 | - static function enum($where_clause=null, $order_clause=null) { |
|
| 518 | + static function enum($where_clause = null, $order_clause = null) { |
|
| 519 | 519 | $db = BoincDb::get(); |
| 520 | 520 | return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause); |
| 521 | 521 | } |
| 522 | - static function enum_fields($fields, $where_clause=null, $order_clause=null) { |
|
| 522 | + static function enum_fields($fields, $where_clause = null, $order_clause = null) { |
|
| 523 | 523 | $db = BoincDb::get(); |
| 524 | 524 | return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause); |
| 525 | 525 | } |
@@ -914,12 +914,12 @@ discard block |
||
| 914 | 914 | return $db->enum('consent', 'BoincConsent', $where_clause); |
| 915 | 915 | } |
| 916 | 916 | |
| 917 | - static function insert ($clause) { |
|
| 917 | + static function insert($clause) { |
|
| 918 | 918 | $db = BoincDb::get(); |
| 919 | 919 | return $db->insert('consent', $clause); |
| 920 | 920 | } |
| 921 | 921 | |
| 922 | - static function update ($clause) { |
|
| 922 | + static function update($clause) { |
|
| 923 | 923 | $db = BoincDb::get(); |
| 924 | 924 | return $db->update_aux('consent', $clause); |
| 925 | 925 | } |
@@ -944,17 +944,17 @@ discard block |
||
| 944 | 944 | return $db->lookup('consent_type', 'BoincConsentType', $clause); |
| 945 | 945 | } |
| 946 | 946 | |
| 947 | - static function enum($where_clause, $order_clause=null) { |
|
| 947 | + static function enum($where_clause, $order_clause = null) { |
|
| 948 | 948 | $db = BoincDb::get(); |
| 949 | 949 | return $db->enum('consent_type', 'BoincConsentType', $where_clause, $order_clause); |
| 950 | 950 | } |
| 951 | 951 | |
| 952 | - static function insert ($clause) { |
|
| 952 | + static function insert($clause) { |
|
| 953 | 953 | $db = BoincDb::get(); |
| 954 | 954 | return $db->insert('consent_type', $clause); |
| 955 | 955 | } |
| 956 | 956 | |
| 957 | - static function update ($clause) { |
|
| 957 | + static function update($clause) { |
|
| 958 | 958 | $db = BoincDb::get(); |
| 959 | 959 | return $db->update_aux('consent_type', $clause); |
| 960 | 960 | } |
@@ -980,7 +980,7 @@ discard block |
||
| 980 | 980 | return $db->lookup('latest_consent', 'BoincLatestConsent', $clause); |
| 981 | 981 | } |
| 982 | 982 | |
| 983 | - static function enum($where_clause, $order_clause=null) { |
|
| 983 | + static function enum($where_clause, $order_clause = null) { |
|
| 984 | 984 | $db = BoincDb::get(); |
| 985 | 985 | return $db->enum('latest_consent', 'BoincLatestConsent', $where_clause, $order_clause); |
| 986 | 986 | } |
@@ -991,7 +991,7 @@ discard block |
||
| 991 | 991 | // apply this to any user-supplied strings used in queries |
| 992 | 992 | // |
| 993 | 993 | function boinc_real_escape_string($x) { |
| 994 | - if (version_compare(phpversion(),"4.3.0")>=0) { |
|
| 994 | + if (version_compare(phpversion(), "4.3.0") >= 0) { |
|
| 995 | 995 | return BoincDb::escape_string($x); |
| 996 | 996 | } else { |
| 997 | 997 | $x = str_replace("'", "\'", $x); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $host = BoincHost::lookup_id($res->hostid); |
| 36 | 36 | $hosts[$res->hostid] = $host; |
| 37 | 37 | } |
| 38 | - $fpops = $res->cpu_time * $host->p_fpops; |
|
| 38 | + $fpops = $res->cpu_time*$host->p_fpops; |
|
| 39 | 39 | $samples[] = $res->cpu_time; |
| 40 | 40 | //$fpops /= 1e9; |
| 41 | 41 | //echo "$res->cpu_time $fpops\n"; |
@@ -45,11 +45,11 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | function show($samples) { |
| 48 | - $x = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]; |
|
| 48 | + $x = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; |
|
| 49 | 49 | foreach ($samples as $s) { |
| 50 | 50 | $x[(int)log10($s)] += 1; |
| 51 | 51 | } |
| 52 | - for ($i=0; $i<16; $i++) { |
|
| 52 | + for ($i = 0; $i < 16; $i++) { |
|
| 53 | 53 | echo sprintf("%d: %d\n", $i, $x[$i]); |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | function reg_form() { |
| 32 | 32 | $config = get_config(); |
| 33 | 33 | $disable_acct = parse_bool($config, "disable_account_creation"); |
| 34 | - page_head("Register", null, null, null, boinc_recaptcha_get_head_extra()); |
|
| 34 | + page_head("Register", null, null, null, boinc_recaptcha_get_head_extra()); |
|
| 35 | 35 | echo "<h3>Create an account</h3>"; |
| 36 | 36 | form_start("create_account_action.php", "post"); |
| 37 | 37 | create_account_form(0, "download_software.php"); |
@@ -58,10 +58,10 @@ |
||
| 58 | 58 | //panel(null, 'panel_contents'); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | -function left(){ |
|
| 61 | +function left() { |
|
| 62 | 62 | global $user, $no_web_account_creation, $project_id; |
| 63 | 63 | panel( |
| 64 | - $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT), |
|
| 64 | + $user ?tra("Welcome, %1", $user->name) : tra("What is %1?", PROJECT), |
|
| 65 | 65 | function() use($user) { |
| 66 | 66 | global $no_web_account_creation, $project_id; |
| 67 | 67 | if ($user) { |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | //panel(null, 'panel_contents'); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | -function left(){ |
|
| 61 | +function left() { |
|
| 62 | 62 | global $user, $no_web_account_creation, $project_id; |
| 63 | 63 | panel( |
| 64 | 64 | $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT), |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | // If $selection is provided, and if it matches one of the entries in the file, |
| 33 | 33 | // it will be selected by default. |
| 34 | 34 | // |
| 35 | -function show_combo_box($name, $filename, $selection=null) { |
|
| 35 | +function show_combo_box($name, $filename, $selection = null) { |
|
| 36 | 36 | echo "<select name=\"$name\" class=\"form-control\">\n"; |
| 37 | 37 | |
| 38 | 38 | $file = fopen($filename, "r"); |
@@ -63,14 +63,14 @@ discard block |
||
| 63 | 63 | <tr><td colspan=2> |
| 64 | 64 | <table border=0 cellpadding=5 |
| 65 | 65 | <tr> |
| 66 | -<td valign=top><a href=\"" . IMAGE_URL . $profile->userid . '.jpg' . "\"><img src=\"" . IMAGE_URL . $profile->userid . '_sm.jpg' . "\"></a> |
|
| 66 | +<td valign=top><a href=\"" . IMAGE_URL.$profile->userid.'.jpg'."\"><img src=\"".IMAGE_URL.$profile->userid.'_sm.jpg'."\"></a> |
|
| 67 | 67 | </td> |
| 68 | -<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning) ." |
|
| 68 | +<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning)." |
|
| 69 | 69 | <p>". |
| 70 | -tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB") ."<br /> |
|
| 70 | +tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB")."<br /> |
|
| 71 | 71 | <input name=picture type=file><br> |
| 72 | 72 | <p>". |
| 73 | -tra("To remove it from your profile, check this box:") . " |
|
| 73 | +tra("To remove it from your profile, check this box:")." |
|
| 74 | 74 | <input type=checkbox name=delete_pic> |
| 75 | 75 | <p> |
| 76 | 76 | </td></tr>"; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | end_table(); |
| 79 | 79 | echo "</td></tr>"; |
| 80 | 80 | } else { |
| 81 | - rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB") . " |
|
| 81 | + rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB")." |
|
| 82 | 82 | <p> |
| 83 | 83 | <input name=picture type=file> |
| 84 | 84 | "); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | row1(tra("Language")); |
| 94 | 94 | echo "<tr><td> |
| 95 | 95 | <p>" . |
| 96 | - tra("Select the language in which your profile is written:") . " |
|
| 96 | + tra("Select the language in which your profile is written:")." |
|
| 97 | 97 | <p> |
| 98 | 98 | "; |
| 99 | 99 | if (isset($profile->language)) { |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | if (recaptcha_public_key()) { |
| 110 | 110 | table_row(boinc_recaptcha_get_html(recaptcha_public_key())); |
| 111 | 111 | } |
| 112 | - table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">"); |
|
| 112 | + table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile")."\" name=\"submit\">"); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | // Returns an array containing: |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | // Determine if the filetype uploaded is supported. |
| 125 | 125 | // TODO: Change these to constants. |
| 126 | - switch($size[2]) { |
|
| 126 | + switch ($size[2]) { |
|
| 127 | 127 | case '2': // JPEG |
| 128 | 128 | $image = imageCreateFromJPEG($fileName); |
| 129 | 129 | break; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | function show_description() { |
| 162 | 162 | echo " |
| 163 | - <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . " |
|
| 163 | + <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT)." |
|
| 164 | 164 | <p> |
| 165 | 165 | "; |
| 166 | 166 | } |
@@ -178,14 +178,14 @@ discard block |
||
| 178 | 178 | row1(show_profile_heading1()); |
| 179 | 179 | rowify(show_profile_question1().bbcode_info()); |
| 180 | 180 | show_textarea("response1", $response1); |
| 181 | - row1( show_profile_heading2()); |
|
| 182 | - rowify( show_profile_question2().bbcode_info()); |
|
| 181 | + row1(show_profile_heading2()); |
|
| 182 | + rowify(show_profile_question2().bbcode_info()); |
|
| 183 | 183 | show_textarea("response2", $response2); |
| 184 | 184 | show_language_selection($profile); |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | function show_textarea($name, $text) { |
| 188 | - rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>"); |
|
| 188 | + rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">".$text."</textarea>"); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | // $profile is null if user doesn't already have a profile. |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | $delete_pic = "off"; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | - if (strlen($response1)==0 && |
|
| 233 | - strlen($response2)==0 && |
|
| 232 | + if (strlen($response1) == 0 && |
|
| 233 | + strlen($response2) == 0 && |
|
| 234 | 234 | $delete_pic != "on" && |
| 235 | 235 | !is_uploaded_file($_FILES['picture']['tmp_name']) |
| 236 | 236 | ) { |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | $profile->verification = 0; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - $profile ? $has_picture = $profile->has_picture: $has_picture = false; |
|
| 247 | + $profile ? $has_picture = $profile->has_picture : $has_picture = false; |
|
| 248 | 248 | |
| 249 | 249 | if (is_uploaded_file($_FILES['picture']['tmp_name'])) { |
| 250 | 250 | $has_picture = true; |
@@ -259,13 +259,13 @@ discard block |
||
| 259 | 259 | |
| 260 | 260 | // Write the original image file to disk. |
| 261 | 261 | // TODO: define a constant for image quality. |
| 262 | - ImageJPEG($images[0], IMAGE_PATH . $user->id . '.jpg'); |
|
| 263 | - ImageJPEG($images[1], IMAGE_PATH . $user->id . '_sm.jpg'); |
|
| 262 | + ImageJPEG($images[0], IMAGE_PATH.$user->id.'.jpg'); |
|
| 263 | + ImageJPEG($images[1], IMAGE_PATH.$user->id.'_sm.jpg'); |
|
| 264 | 264 | } |
| 265 | 265 | $response1 = sanitize_html($response1); |
| 266 | 266 | $response2 = sanitize_html($response2); |
| 267 | 267 | |
| 268 | - $has_picture = $has_picture?1:0; |
|
| 268 | + $has_picture = $has_picture ? 1 : 0; |
|
| 269 | 269 | if ($profile) { |
| 270 | 270 | $query = " response1 = '".BoincDb::escape_string($response1)."'," |
| 271 | 271 | ." response2 = '".BoincDb::escape_string($response2)."'," |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | page_tail(); |
| 308 | 308 | } |
| 309 | 309 | |
| 310 | -function show_profile_form($profile, $warning=null) { |
|
| 310 | +function show_profile_form($profile, $warning = null) { |
|
| 311 | 311 | if ($profile) { |
| 312 | 312 | page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra()); |
| 313 | 313 | } else { |