@@ -50,7 +50,7 @@ |
||
50 | 50 | } else { |
51 | 51 | echo tra("Email address has been reverted.")."<br /><br />".tra("You need to reset your password: ")."<a href=\"".secure_url_base()."get_passwd.php\">".secure_url_base()."get_passwd.php</a>"; |
52 | 52 | |
53 | - $database_passwd_hash = password_hash(random_string() , PASSWORD_DEFAULT); |
|
53 | + $database_passwd_hash = password_hash(random_string(), PASSWORD_DEFAULT); |
|
54 | 54 | //Change previous_email |
55 | 55 | $result = $tmpuser->update( |
56 | 56 | "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0" |
@@ -11,39 +11,39 @@ |
||
11 | 11 | BoincToken::insert("(token,userid,type,create_time, expire_time) values ('$token', 0, 'T', $now, $now+3600)"); |
12 | 12 | |
13 | 13 | $boincTokens = BoincToken::enum("userid=0"); |
14 | -foreach($boincTokens as $boincToken) { |
|
15 | - echo $boincToken->token . "\n"; |
|
16 | - echo $boincToken->userid . "\n"; |
|
17 | - echo $boincToken->type . "\n"; |
|
18 | - echo $boincToken->create_time . "\n"; |
|
19 | - echo $boincToken->expire_time . "\n"; |
|
14 | +foreach ($boincTokens as $boincToken) { |
|
15 | + echo $boincToken->token."\n"; |
|
16 | + echo $boincToken->userid."\n"; |
|
17 | + echo $boincToken->type."\n"; |
|
18 | + echo $boincToken->create_time."\n"; |
|
19 | + echo $boincToken->expire_time."\n"; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | echo "---------------\n"; |
23 | 23 | $boincToken = BoincToken::lookup("userid=0"); |
24 | -echo $boincToken->token . "\n"; |
|
25 | -echo $boincToken->userid . "\n"; |
|
26 | -echo $boincToken->type . "\n"; |
|
27 | -echo $boincToken->create_time . "\n"; |
|
28 | -echo $boincToken->expire_time . "\n"; |
|
24 | +echo $boincToken->token."\n"; |
|
25 | +echo $boincToken->userid."\n"; |
|
26 | +echo $boincToken->type."\n"; |
|
27 | +echo $boincToken->create_time."\n"; |
|
28 | +echo $boincToken->expire_time."\n"; |
|
29 | 29 | |
30 | 30 | echo "---------------\n"; |
31 | 31 | $boincToken = BoincToken::lookup_valid_token(0, $token, 'T'); |
32 | -if ( $boincToken != null ) { |
|
32 | +if ($boincToken != null) { |
|
33 | 33 | echo "Found valid token\n"; |
34 | 34 | } |
35 | 35 | |
36 | 36 | echo "---------------\n"; |
37 | 37 | $boincToken = BoincToken::lookup_valid_token(0, 'notrealtoken', 'T'); |
38 | -if ( $boincToken == null ) { |
|
38 | +if ($boincToken == null) { |
|
39 | 39 | echo "Successfully didn't find invalid token\n"; |
40 | 40 | } |
41 | 41 | |
42 | 42 | echo "---------------\n"; |
43 | 43 | $user = new BoincUser(); |
44 | -$user->id=0; |
|
44 | +$user->id = 0; |
|
45 | 45 | $token = create_token($user->id, TOKEN_TYPE_DELETE_ACCOUNT, TOKEN_DURATION_ONE_DAY); |
46 | -if ( is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) { |
|
46 | +if (is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT)) { |
|
47 | 47 | echo "Successfully created and validated delete account token"; |
48 | 48 | } |
49 | 49 |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $items['host/%/set-venue/%'] = array( |
134 | 134 | 'title' => 'Set host venue', |
135 | 135 | 'page callback' => 'boincwork_host_set_venue', |
136 | - 'page arguments' => array(1,3), |
|
136 | + 'page arguments' => array(1, 3), |
|
137 | 137 | 'access callback' => 'user_is_logged_in', |
138 | 138 | 'type' => MENU_CALLBACK, |
139 | 139 | ); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | 'title' => 'Account Tasks Table', |
185 | 185 | 'description' => '', |
186 | 186 | 'page callback' => 'boincwork_account_task_table', |
187 | - 'page arguments' => array(2,3), |
|
187 | + 'page arguments' => array(2, 3), |
|
188 | 188 | 'access arguments' => array('access content'), |
189 | 189 | 'type' => MENU_CALLBACK, |
190 | 190 | ); |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | 'title' => 'Host Tasks Table', |
193 | 193 | 'description' => '', |
194 | 194 | 'page callback' => 'boincwork_host_task_table', |
195 | - 'page arguments' => array(1,3,4), |
|
195 | + 'page arguments' => array(1, 3, 4), |
|
196 | 196 | 'access arguments' => array('access content'), |
197 | 197 | 'type' => MENU_CALLBACK, |
198 | 198 | ); |
@@ -276,15 +276,15 @@ discard block |
||
276 | 276 | if ($vars['message']['is_blocked']) { |
277 | 277 | $vars['message_actions']['unignore_user'] = array( |
278 | 278 | 'title' => bts('Stop Ignoring User', array(), NULL, 'boinc:ignore-user-remove'), |
279 | - 'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid, |
|
280 | - 'query' => 'destination=messages/view/' . $thread_id, |
|
279 | + 'href' => 'account/prefs/privacy/ignore_user/remove/'.$author->uid, |
|
280 | + 'query' => 'destination=messages/view/'.$thread_id, |
|
281 | 281 | ); |
282 | 282 | } |
283 | 283 | else { |
284 | 284 | $vars['message_actions']['ignore_user'] = array( |
285 | 285 | 'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'), |
286 | - 'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid, |
|
287 | - 'query' => 'destination=messages/view/' . $thread_id, |
|
286 | + 'href' => 'account/prefs/privacy/ignore_user/add/'.$author->uid, |
|
287 | + 'query' => 'destination=messages/view/'.$thread_id, |
|
288 | 288 | ); |
289 | 289 | } |
290 | 290 | } |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | // Delete expired hosts in the BOINC database, host_delete table. |
298 | 298 | require_boinc('boinc_db'); |
299 | 299 | $num_deleted = BoincHostDeleted::delete_expired(); |
300 | - if ($num_deleted>0) { |
|
300 | + if ($num_deleted > 0) { |
|
301 | 301 | watchdog('boincwork', "Deleted ${num_deleted} hosts from host_deleted table", WATCHDOG_NOTICE); |
302 | 302 | } |
303 | 303 | } |
@@ -344,10 +344,10 @@ discard block |
||
344 | 344 | drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state); |
345 | 345 | } |
346 | 346 | |
347 | - $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>'; |
|
348 | - $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing') . '</p>'; |
|
349 | - $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>'; |
|
350 | - $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>'; |
|
347 | + $output .= '<p>'.bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing').'<br/>'; |
|
348 | + $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing').'</p>'; |
|
349 | + $output .= '<p>'.bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences').'</p>'; |
|
350 | + $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/computing').'</h2>'; |
|
351 | 351 | |
352 | 352 | $output .= '<table class="preferences combined">'; |
353 | 353 | |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | $output .= '<tr class="section-heading">'; |
358 | 358 | $output .= "<td>{$section['name']}</td>"; |
359 | 359 | foreach ($pref_sets as $pref_set) { |
360 | - $output .= '<td>' . $pref_set . '</td>'; |
|
360 | + $output .= '<td>'.$pref_set.'</td>'; |
|
361 | 361 | } |
362 | 362 | $output .= '</tr>'; |
363 | 363 | foreach ($section['elements'] as $name => $setting) { |
@@ -405,11 +405,11 @@ discard block |
||
405 | 405 | $second_pref = $special_map[$name]; |
406 | 406 | $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref]; |
407 | 407 | $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value']; |
408 | - $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" . |
|
408 | + $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}". |
|
409 | 409 | " {$second_value} {$second_pref_setting['#field_suffix']} </td>"; |
410 | 410 | } |
411 | 411 | } |
412 | - else { |
|
412 | + else { |
|
413 | 413 | $output .= '<td>---</td>'; |
414 | 414 | } |
415 | 415 | } |
@@ -437,12 +437,12 @@ discard block |
||
437 | 437 | ); |
438 | 438 | // Show Clear links for established preference sets |
439 | 439 | if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) { |
440 | - $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}", |
|
440 | + $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}", |
|
441 | 441 | array( |
442 | 442 | 'query' => drupal_get_destination(), |
443 | 443 | 'attributes' => array( |
444 | - 'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?', |
|
445 | - array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')' |
|
444 | + 'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?', |
|
445 | + array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences').'\')' |
|
446 | 446 | ) |
447 | 447 | ) |
448 | 448 | ); |
@@ -468,8 +468,8 @@ discard block |
||
468 | 468 | "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location') |
469 | 469 | ); |
470 | 470 | variable_set('jump_use_js_venues-Array', 1); |
471 | - drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js'); |
|
472 | - drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme'); |
|
471 | + drupal_add_js(drupal_get_path('module', 'jump').'/jump.js'); |
|
472 | + drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme'); |
|
473 | 473 | |
474 | 474 | $output .= '<div id="venue-selector" class="simple-form-controls">'; |
475 | 475 | $output .= ' <div class="form-item venue">'; |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | if (!$current_set['#established']) { |
490 | 490 | drupal_set_message(bts( |
491 | 491 | "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.", |
492 | - array( '@venue' => $venue, ), |
|
492 | + array('@venue' => $venue,), |
|
493 | 493 | NULL, 'boinc:account-preferences'), 'status'); |
494 | 494 | } |
495 | 495 | |
@@ -548,8 +548,8 @@ discard block |
||
548 | 548 | drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state); |
549 | 549 | } |
550 | 550 | |
551 | - $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>'; |
|
552 | - $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>'; |
|
551 | + $output .= '<p>'.bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences').'</p>'; |
|
552 | + $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/project').'</h2>'; |
|
553 | 553 | |
554 | 554 | $output .= '<table class="preferences combined">'; |
555 | 555 | |
@@ -559,7 +559,7 @@ discard block |
||
559 | 559 | $output .= '<tr class="section-heading">'; |
560 | 560 | $output .= "<td>{$section['name']}</td>"; |
561 | 561 | foreach ($pref_sets as $pref_set) { |
562 | - $output .= '<td>' . $pref_set . '</td>'; |
|
562 | + $output .= '<td>'.$pref_set.'</td>'; |
|
563 | 563 | } |
564 | 564 | $output .= '</tr>'; |
565 | 565 | foreach ($section['elements'] as $name => $setting) { |
@@ -601,12 +601,12 @@ discard block |
||
601 | 601 | $output .= l($action_text, "account/prefs/project/edit/{$pref_set}"); |
602 | 602 | // Show Clear links for established preference sets |
603 | 603 | if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) { |
604 | - $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}", |
|
604 | + $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}", |
|
605 | 605 | array( |
606 | 606 | 'query' => drupal_get_destination(), |
607 | 607 | 'attributes' => array( |
608 | - 'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?', |
|
609 | - array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')' |
|
608 | + 'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?', |
|
609 | + array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project').'\')' |
|
610 | 610 | ) |
611 | 611 | ) |
612 | 612 | ); |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | // Set this preference set as the one to use for any new hosts attached |
623 | 623 | // to the user account |
624 | 624 | boincwork_set_default_venue($venue); |
625 | - drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project') ); |
|
625 | + drupal_set_message(bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project')); |
|
626 | 626 | drupal_goto('account/prefs/project/combined'); |
627 | 627 | break; |
628 | 628 | |
@@ -641,8 +641,8 @@ discard block |
||
641 | 641 | "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location') |
642 | 642 | ); |
643 | 643 | variable_set('jump_use_js_venues-Array', 1); |
644 | - drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js'); |
|
645 | - drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme'); |
|
644 | + drupal_add_js(drupal_get_path('module', 'jump').'/jump.js'); |
|
645 | + drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme'); |
|
646 | 646 | |
647 | 647 | $output .= '<div id="venue-selector" class="simple-form-controls">'; |
648 | 648 | $output .= ' <div class="form-item venue">'; |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | if (!$current_set['#established']) { |
663 | 663 | drupal_set_message(bts( |
664 | 664 | "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.", |
665 | - array( '@venue' => $venue, ), |
|
665 | + array('@venue' => $venue,), |
|
666 | 666 | NULL, 'boinc:account-preferences'), 'status'); |
667 | 667 | } |
668 | 668 | |
@@ -734,7 +734,7 @@ discard block |
||
734 | 734 | // Edit preferences link |
735 | 735 | $output .= '<tr>'; |
736 | 736 | $output .= '<td></td>'; |
737 | - $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>'; |
|
737 | + $output .= '<td>'.l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit").'</td>'; |
|
738 | 738 | $output .= '</tr>'; |
739 | 739 | |
740 | 740 | $output .= '</table>'; |
@@ -769,15 +769,15 @@ discard block |
||
769 | 769 | switch ($type) { |
770 | 770 | case 'all': |
771 | 771 | //include_boinc('user/cert_all.php'); |
772 | - require_boinc(array('util','cert','user')); |
|
772 | + require_boinc(array('util', 'cert', 'user')); |
|
773 | 773 | |
774 | 774 | $join = date('j F Y', $boincuser->create_time); |
775 | 775 | $today = date('j F Y', time(0)); |
776 | 776 | |
777 | - if ($border=="no") { |
|
777 | + if ($border == "no") { |
|
778 | 778 | $border = 0; |
779 | 779 | } else { |
780 | - $border=8; |
|
780 | + $border = 8; |
|
781 | 781 | } |
782 | 782 | |
783 | 783 | $title_font = "\"Optima,ZapfChancery\""; |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr> |
822 | 822 | "; |
823 | 823 | foreach ($boincuser->projects as $p) { |
824 | - if ($p->total_credit<100) continue; |
|
824 | + if ($p->total_credit < 100) continue; |
|
825 | 825 | show_proj($p); |
826 | 826 | } |
827 | 827 | echo " |
@@ -840,15 +840,15 @@ discard block |
||
840 | 840 | case 'account': |
841 | 841 | default: |
842 | 842 | //include_boinc('user/cert1.php'); |
843 | - require_boinc(array('util','cert')); |
|
843 | + require_boinc(array('util', 'cert')); |
|
844 | 844 | |
845 | 845 | $join = date('j F Y', $boincuser->create_time); |
846 | 846 | $today = date('j F Y', time(0)); |
847 | 847 | |
848 | - if ($border=="no") { |
|
848 | + if ($border == "no") { |
|
849 | 849 | $border = 0; |
850 | 850 | } else { |
851 | - $border=8; |
|
851 | + $border = 8; |
|
852 | 852 | } |
853 | 853 | |
854 | 854 | $credit = credit_string($boincuser->total_credit, false); |
@@ -1064,7 +1064,7 @@ discard block |
||
1064 | 1064 | |
1065 | 1065 | // If terms of use string exists and override is true, set terms-of-use |
1066 | 1066 | // to Drupal varaible. |
1067 | - if ( (!empty($termsofuse) && ($overrideboinctou)) ) { |
|
1067 | + if ((!empty($termsofuse) && ($overrideboinctou))) { |
|
1068 | 1068 | if (!empty($xml['project_config']['terms_of_use'])) { |
1069 | 1069 | // Remove any existing terms of use |
1070 | 1070 | unset($xml['project_config']['terms_of_use']); |
@@ -1111,7 +1111,7 @@ discard block |
||
1111 | 1111 | * Page callback for host task table |
1112 | 1112 | */ |
1113 | 1113 | function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) { |
1114 | - require_boinc( array('util', 'result') ); |
|
1114 | + require_boinc(array('util', 'result')); |
|
1115 | 1115 | |
1116 | 1116 | $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table'); |
1117 | 1117 | drupal_set_title($title); |
@@ -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, $master_url, $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, $master_url, $project_id; |
67 | 67 | if ($user) { |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | } |
188 | 188 | |
189 | 189 | if (!is_null($teamid)) { |
190 | - if ($teamid==0) { |
|
190 | + if ($teamid == 0) { |
|
191 | 191 | user_quit_team($user); |
192 | 192 | } else { |
193 | 193 | $team = BoincTeam::lookup_id_nocache($teamid); |
@@ -240,15 +240,15 @@ discard block |
||
240 | 240 | // table. If one or more of these consent_xyz parameters are NOT |
241 | 241 | // present, the RPC will still return 'success', even though the |
242 | 242 | // consent table is not updated. |
243 | -if ( (isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source)) ) { |
|
243 | +if ((isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source))) { |
|
244 | 244 | list($checkct, $ctid) = check_consent_type($consent_name); |
245 | 245 | if ($checkct) { |
246 | 246 | |
247 | 247 | // Check to see if latest consent of this name is already |
248 | 248 | // given. |
249 | - $cr= BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1"); |
|
250 | - if ( (($cr) and ($cr->consent_flag!=$consent_flag)) or |
|
251 | - (!$cr) ) { |
|
249 | + $cr = BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1"); |
|
250 | + if ((($cr) and ($cr->consent_flag != $consent_flag)) or |
|
251 | + (!$cr)) { |
|
252 | 252 | |
253 | 253 | $rc = consent_to_a_policy($user, $ctid, $consent_flag, $consent_not_required, $consent_source, time()); |
254 | 254 | if (!$rc) { |
@@ -53,7 +53,7 @@ |
||
53 | 53 | // Toggles the enable flag |
54 | 54 | function mct_toggle_field($field) { |
55 | 55 | $ctid = post_int("consent_type_id"); |
56 | - $toggle = post_str("toggle" . $field); |
|
56 | + $toggle = post_str("toggle".$field); |
|
57 | 57 | if ($toggle == "Click to Enable") { |
58 | 58 | $state = 1; |
59 | 59 | $action = "Enabled"; |
@@ -82,7 +82,7 @@ |
||
82 | 82 | |
83 | 83 | page_head(tra("Account Deleted")); |
84 | 84 | |
85 | - echo "<p>".tra("Your account has been deleted. If you want to contribute to %1 in the future you will need to create a new account.",PROJECT)."</p>"; |
|
85 | + echo "<p>".tra("Your account has been deleted. If you want to contribute to %1 in the future you will need to create a new account.", PROJECT)."</p>"; |
|
86 | 86 | |
87 | 87 | page_tail(); |
88 | 88 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | start_table(); |
28 | 28 | echo " |
29 | 29 | <tr><td>" |
30 | - . tra("Leader boards for %1",PROJECT).": |
|
30 | + . tra("Leader boards for %1", PROJECT).": |
|
31 | 31 | <ul> |
32 | 32 | <li><a href=\"top_users.php\">" . tra("Participants")."</a> |
33 | 33 | "; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | if (!DISABLE_TEAMS) { |
39 | 39 | echo " |
40 | - <li><a href=\"top_teams.php\">" . tra("Teams"). "</a> |
|
40 | + <li><a href=\"top_teams.php\">" . tra("Teams")."</a> |
|
41 | 41 | "; |
42 | 42 | if ($credit_by_app) { |
43 | 43 | echo "<ul><li><a href=per_app_list.php?is_team=1>Per application</a></ul>\n"; |
@@ -22,14 +22,14 @@ |
||
22 | 22 | require_once("../inc/util.inc"); |
23 | 23 | require_once("../inc/cache.inc"); |
24 | 24 | |
25 | -$min_credit = .1; // only count hosts with this much RAC |
|
25 | +$min_credit = .1; // only count hosts with this much RAC |
|
26 | 26 | $total_rac = 0; |
27 | 27 | |
28 | 28 | define("CACHE_PERIOD", 7*86400); |
29 | 29 | |
30 | 30 | function show_type($type, $stats) { |
31 | 31 | global $total_rac; |
32 | - $pct = $total_rac?number_format(100*$stats->rac/$total_rac, 4):0; |
|
32 | + $pct = $total_rac ?number_format(100*$stats->rac/$total_rac, 4) : 0; |
|
33 | 33 | row_array(array($type, $stats->nhosts, "$pct %")); |
34 | 34 | } |
35 | 35 |