@@ -41,7 +41,7 @@ |
||
| 41 | 41 | $f->mode = "local_staged"; |
| 42 | 42 | $f->source = "input"; |
| 43 | 43 | |
| 44 | - for ($i=10; $i<20; $i++) { |
|
| 44 | + for ($i = 10; $i < 20; $i++) { |
|
| 45 | 45 | $job = new StdClass; |
| 46 | 46 | $job->input_files = array($f); |
| 47 | 47 | $job->rsc_fpops_est = $i*1e9; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | if ($template) { |
| 62 | 62 | $t = (double)$template->workunit->rsc_fpops_est; |
| 63 | 63 | } |
| 64 | - foreach($r->batch->job as $job) { |
|
| 64 | + foreach ($r->batch->job as $job) { |
|
| 65 | 65 | $y = (double)$job->rsc_fpops_est; |
| 66 | 66 | if ($y) { |
| 67 | 67 | $x += $y; |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | function est_elapsed_time($r, $template) { |
| 88 | 88 | // crude estimate: batch FLOPs / project FLOPS |
| 89 | 89 | // |
| 90 | - return batch_flop_count($r, $template) / project_flops(); |
|
| 90 | + return batch_flop_count($r, $template)/project_flops(); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | // if batch-level input template filename was given, read it; |
@@ -97,9 +97,9 @@ discard block |
||
| 97 | 97 | // |
| 98 | 98 | function read_input_template($app, $r) { |
| 99 | 99 | if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) { |
| 100 | - $path = project_dir() . "/templates/".$r->batch->workunit_template_file; |
|
| 100 | + $path = project_dir()."/templates/".$r->batch->workunit_template_file; |
|
| 101 | 101 | } else { |
| 102 | - $path = project_dir() . "/templates/$app->name"."_in"; |
|
| 102 | + $path = project_dir()."/templates/$app->name"."_in"; |
|
| 103 | 103 | } |
| 104 | 104 | if (file_exists($path)) { |
| 105 | 105 | $x = simplexml_load_file($path); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | function validate_batch($jobs, $template) { |
| 145 | 145 | $i = 0; |
| 146 | 146 | $n = count($template->file_info); |
| 147 | - foreach($jobs as $job) { |
|
| 147 | + foreach ($jobs as $job) { |
|
| 148 | 148 | $m = count($job->input_files); |
| 149 | 149 | if ($n != $m) { |
| 150 | 150 | log_write("wrong # of input files for job $i: need $n, got $m"); |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | // stage all the files |
| 206 | 206 | // |
| 207 | 207 | function stage_files(&$jobs) { |
| 208 | - foreach($jobs as $job) { |
|
| 208 | + foreach ($jobs as $job) { |
|
| 209 | 209 | foreach ($job->input_files as $file) { |
| 210 | 210 | if ($file->mode != "remote") { |
| 211 | 211 | $file->name = stage_file($file); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | // |
| 219 | 219 | function submit_jobs( |
| 220 | 220 | $jobs, $job_params, $app, $batch_id, $priority, $app_version_num, |
| 221 | - $input_template_filename, // batch-level; can also specify per job |
|
| 221 | + $input_template_filename, // batch-level; can also specify per job |
|
| 222 | 222 | $output_template_filename |
| 223 | 223 | ) { |
| 224 | 224 | global $input_templates, $output_templates; |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | // one line per job |
| 228 | 228 | // |
| 229 | 229 | $x = ""; |
| 230 | - foreach($jobs as $job) { |
|
| 230 | + foreach ($jobs as $job) { |
|
| 231 | 231 | if ($job->name) { |
| 232 | 232 | $x .= " --wu_name $job->name"; |
| 233 | 233 | } |
@@ -262,8 +262,8 @@ discard block |
||
| 262 | 262 | $x .= "\n"; |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | - $errfile = "/tmp/create_work_" . getmypid() . ".err"; |
|
| 266 | - $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id"; |
|
| 265 | + $errfile = "/tmp/create_work_".getmypid().".err"; |
|
| 266 | + $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id"; |
|
| 267 | 267 | if ($priority !== null) { |
| 268 | 268 | $cmd .= " --priority $priority"; |
| 269 | 269 | } |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | // |
| 364 | 364 | function xml_get_jobs($r) { |
| 365 | 365 | $jobs = array(); |
| 366 | - foreach($r->batch->job as $j) { |
|
| 366 | + foreach ($r->batch->job as $j) { |
|
| 367 | 367 | $job = new StdClass; |
| 368 | 368 | $job->input_files = array(); |
| 369 | 369 | $job->command_line = (string)$j->command_line; |
@@ -414,16 +414,16 @@ discard block |
||
| 414 | 414 | // |
| 415 | 415 | function logical_end_time($r, $jobs, $user, $app) { |
| 416 | 416 | $total_flops = 0; |
| 417 | - foreach($jobs as $job) { |
|
| 417 | + foreach ($jobs as $job) { |
|
| 418 | 418 | //print_r($job); |
| 419 | 419 | if ($job->rsc_fpops_est) { |
| 420 | 420 | $total_flops += $job->rsc_fpops_est; |
| 421 | 421 | } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) { |
| 422 | - $total_flops += (double) $job->input_template->workunit->rsc_fpops_est; |
|
| 422 | + $total_flops += (double)$job->input_template->workunit->rsc_fpops_est; |
|
| 423 | 423 | } else if ($r->batch->job_params->rsc_fpops_est) { |
| 424 | - $total_flops += (double) $r->batch->job_params->rsc_fpops_est; |
|
| 424 | + $total_flops += (double)$r->batch->job_params->rsc_fpops_est; |
|
| 425 | 425 | } else { |
| 426 | - $x = (double) $template->workunit->rsc_fpops_est; |
|
| 426 | + $x = (double)$template->workunit->rsc_fpops_est; |
|
| 427 | 427 | if ($x) { |
| 428 | 428 | $total_flops += $x; |
| 429 | 429 | } else { |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | } |
| 432 | 432 | } |
| 433 | 433 | } |
| 434 | - $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
| 434 | + $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
| 435 | 435 | $x = exec($cmd); |
| 436 | 436 | if (!is_numeric($x) || (double)$x == 0) { |
| 437 | 437 | xml_error(-1, "$cmd returned $x"); |
@@ -508,15 +508,15 @@ discard block |
||
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | $job_params = new StdClass; |
| 511 | - $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound; |
|
| 512 | - $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est; |
|
| 513 | - $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound; |
|
| 514 | - $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound; |
|
| 515 | - $job_params->delay_bound = (double) $r->batch->job_params->delay_bound; |
|
| 511 | + $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound; |
|
| 512 | + $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est; |
|
| 513 | + $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound; |
|
| 514 | + $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound; |
|
| 515 | + $job_params->delay_bound = (double)$r->batch->job_params->delay_bound; |
|
| 516 | 516 | // could add quorum-related stuff |
| 517 | 517 | |
| 518 | - $input_template_filename = (string) $r->batch->input_template_filename; |
|
| 519 | - $output_template_filename = (string) $r->batch->output_template_filename; |
|
| 518 | + $input_template_filename = (string)$r->batch->input_template_filename; |
|
| 519 | + $output_template_filename = (string)$r->batch->output_template_filename; |
|
| 520 | 520 | // possibly empty |
| 521 | 521 | |
| 522 | 522 | submit_jobs( |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | } |
| 605 | 605 | |
| 606 | 606 | function n_outfiles($wu) { |
| 607 | - $path = project_dir() . "/$wu->output_template_filename"; |
|
| 607 | + $path = project_dir()."/$wu->output_template_filename"; |
|
| 608 | 608 | $r = simplexml_load_file($path); |
| 609 | 609 | return count($r->file_info); |
| 610 | 610 | } |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | "; |
| 812 | 812 | if ($result->server_state == 5) { // over? |
| 813 | 813 | $paths = get_outfile_paths($result); |
| 814 | - foreach($paths as $path) { |
|
| 814 | + foreach ($paths as $path) { |
|
| 815 | 815 | if (is_file($path)) { |
| 816 | 816 | $size = filesize($path); |
| 817 | 817 | echo " <outfile> |
@@ -855,7 +855,7 @@ discard block |
||
| 855 | 855 | } else { |
| 856 | 856 | $results = BoincResult::enum("workunitid=$job_id"); |
| 857 | 857 | foreach ($results as $r) { |
| 858 | - switch($r->outcome) { |
|
| 858 | + switch ($r->outcome) { |
|
| 859 | 859 | case 1: |
| 860 | 860 | case 3: |
| 861 | 861 | case 6: |
@@ -970,8 +970,8 @@ discard block |
||
| 970 | 970 | } |
| 971 | 971 | |
| 972 | 972 | list($user, $user_submit) = authenticate_user($r, $app); |
| 973 | - $in = file_get_contents(project_dir() . "/templates/".$app->name."_in"); |
|
| 974 | - $out = file_get_contents(project_dir() . "/templates/".$app->name."_out"); |
|
| 973 | + $in = file_get_contents(project_dir()."/templates/".$app->name."_in"); |
|
| 974 | + $out = file_get_contents(project_dir()."/templates/".$app->name."_out"); |
|
| 975 | 975 | if ($in === false || $out === false) { |
| 976 | 976 | log_write("template file missing"); |
| 977 | 977 | xml_error(-1, "template file missing"); |
@@ -983,7 +983,7 @@ discard block |
||
| 983 | 983 | |
| 984 | 984 | function ping($r) { |
| 985 | 985 | xml_start_tag("ping"); |
| 986 | - BoincDb::get(); // errors out if DB down or web disabled |
|
| 986 | + BoincDb::get(); // errors out if DB down or web disabled |
|
| 987 | 987 | echo "<success>1</success> |
| 988 | 988 | </ping> |
| 989 | 989 | "; |
@@ -1050,9 +1050,9 @@ discard block |
||
| 1050 | 1050 | $request_log = parse_config(get_config(), "<remote_submit_request_log>"); |
| 1051 | 1051 | if ($request_log) { |
| 1052 | 1052 | $log_dir = parse_config(get_config(), "<log_dir>"); |
| 1053 | - $request_log = $log_dir . "/" . $request_log; |
|
| 1053 | + $request_log = $log_dir."/".$request_log; |
|
| 1054 | 1054 | if ($file = fopen($request_log, "a")) { |
| 1055 | - fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n"); |
|
| 1055 | + fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n"); |
|
| 1056 | 1056 | fclose($file); |
| 1057 | 1057 | } |
| 1058 | 1058 | } |
@@ -24,71 +24,71 @@ |
||
| 24 | 24 | define('KW_CATEGORY_SCIENCE', 0); |
| 25 | 25 | define('KW_CATEGORY_LOC', 1); |
| 26 | 26 | |
| 27 | -define('KW_ASTRONOMY', 1); |
|
| 28 | -define('KW_SETI', 2); |
|
| 29 | -define('KW_PULSARS', 3); |
|
| 30 | -define('KW_GW', 4); |
|
| 31 | -define('KW_COSMOLOGY', 5); |
|
| 32 | -define('KW_PHYSICS', 6); |
|
| 27 | +define('KW_ASTRONOMY', 1); |
|
| 28 | +define('KW_SETI', 2); |
|
| 29 | +define('KW_PULSARS', 3); |
|
| 30 | +define('KW_GW', 4); |
|
| 31 | +define('KW_COSMOLOGY', 5); |
|
| 32 | +define('KW_PHYSICS', 6); |
|
| 33 | 33 | define('KW_PARTICLE_PHYSICS', 7); |
| 34 | -define('KW_NANOSCIENCE', 8); |
|
| 35 | -define('KW_BIOMED', 9); |
|
| 34 | +define('KW_NANOSCIENCE', 8); |
|
| 35 | +define('KW_BIOMED', 9); |
|
| 36 | 36 | define('KW_DRUG_DISCOVERY', 10); |
| 37 | -define('KW_PROTEINS', 11); |
|
| 38 | -define('KW_GENETICS', 12); |
|
| 39 | -define('KW_DISEASE', 13); |
|
| 40 | -define('KW_CANCER', 14); |
|
| 41 | -define('KW_MATH_CS', 15); |
|
| 42 | -define('KW_AI', 16); |
|
| 43 | -define('KW_OCEANIA', 17); |
|
| 44 | -define('KW_AUSTRALIA', 18); |
|
| 37 | +define('KW_PROTEINS', 11); |
|
| 38 | +define('KW_GENETICS', 12); |
|
| 39 | +define('KW_DISEASE', 13); |
|
| 40 | +define('KW_CANCER', 14); |
|
| 41 | +define('KW_MATH_CS', 15); |
|
| 42 | +define('KW_AI', 16); |
|
| 43 | +define('KW_OCEANIA', 17); |
|
| 44 | +define('KW_AUSTRALIA', 18); |
|
| 45 | 45 | |
| 46 | -define('KW_EUROPE', 20); |
|
| 47 | -define('KW_GERMANY', 21); |
|
| 48 | -define('KW_ASIA', 22); |
|
| 49 | -define('KW_AMERICAS', 23); |
|
| 50 | -define('KW_US', 24); |
|
| 51 | -define('KW_UCB', 25); |
|
| 52 | -define('KW_AEI', 26); |
|
| 53 | -define('KW_CERN', 27); |
|
| 54 | -define('KW_UW', 28); |
|
| 55 | -define('KW_EARTH_SCI', 29); |
|
| 56 | -define('KW_SPAIN', 30); |
|
| 57 | -define('KW_SAN_JORGE', 31); |
|
| 58 | -define('KW_NUMBER_THEORY', 32); |
|
| 59 | -define('KW_CRYPTO', 33); |
|
| 60 | -define('KW_ENV_RESEARCH', 34); |
|
| 61 | -define('KW_CLIMATE', 35); |
|
| 62 | -define('KW_CZECH', 36); |
|
| 46 | +define('KW_EUROPE', 20); |
|
| 47 | +define('KW_GERMANY', 21); |
|
| 48 | +define('KW_ASIA', 22); |
|
| 49 | +define('KW_AMERICAS', 23); |
|
| 50 | +define('KW_US', 24); |
|
| 51 | +define('KW_UCB', 25); |
|
| 52 | +define('KW_AEI', 26); |
|
| 53 | +define('KW_CERN', 27); |
|
| 54 | +define('KW_UW', 28); |
|
| 55 | +define('KW_EARTH_SCI', 29); |
|
| 56 | +define('KW_SPAIN', 30); |
|
| 57 | +define('KW_SAN_JORGE', 31); |
|
| 58 | +define('KW_NUMBER_THEORY', 32); |
|
| 59 | +define('KW_CRYPTO', 33); |
|
| 60 | +define('KW_ENV_RESEARCH', 34); |
|
| 61 | +define('KW_CLIMATE', 35); |
|
| 62 | +define('KW_CZECH', 36); |
|
| 63 | 63 | define('KW_CHARLES_PRAGUE', 37); |
| 64 | -define('KW_RECHENKRAFT', 38); |
|
| 65 | -define('KW_RHEINMAIN', 39); |
|
| 66 | -define('KW_HUNGARY', 40); |
|
| 67 | -define('KW_IRELAND', 41); |
|
| 68 | -define('KW_UC_DUBLIN', 42); |
|
| 69 | -define('KW_POLAND', 43); |
|
| 70 | -define('KW_RUSSIA', 44); |
|
| 64 | +define('KW_RECHENKRAFT', 38); |
|
| 65 | +define('KW_RHEINMAIN', 39); |
|
| 66 | +define('KW_HUNGARY', 40); |
|
| 67 | +define('KW_IRELAND', 41); |
|
| 68 | +define('KW_UC_DUBLIN', 42); |
|
| 69 | +define('KW_POLAND', 43); |
|
| 70 | +define('KW_RUSSIA', 44); |
|
| 71 | 71 | define('KW_SW_STATE_RUSSIA', 45); |
| 72 | -define('KW_RAS', 46); |
|
| 73 | -define('KW_PRBB', 47); |
|
| 74 | -define('KW_UK', 48); |
|
| 75 | -define('KW_OXFORD', 49); |
|
| 76 | -define('KW_CHINA', 50); |
|
| 77 | -define('KW_U_DAYTON', 51); |
|
| 78 | -define('KW_WRIGHT_STATE', 52); |
|
| 79 | -define('KW_USC', 53); |
|
| 80 | -define('KW_FULLERTON', 54); |
|
| 81 | -define('KW_ARIZONA_STATE', 55); |
|
| 82 | -define('KW_U_ILLINOIS', 56); |
|
| 83 | -define('KW_U_WARSAW', 57); |
|
| 84 | -define('KW_RPI', 58); |
|
| 85 | -define('KW_INTERNATIONAL', 59); |
|
| 86 | -define('KW_UND', 60); |
|
| 87 | -define('KW_HOLLAND', 61); |
|
| 88 | -define('KW_CHEMISTRY', 62); |
|
| 89 | -define('KW_GAMES', 63); |
|
| 90 | -define('KW_VIRUS', 64); |
|
| 91 | -define('KW_FRANCE', 65); |
|
| 72 | +define('KW_RAS', 46); |
|
| 73 | +define('KW_PRBB', 47); |
|
| 74 | +define('KW_UK', 48); |
|
| 75 | +define('KW_OXFORD', 49); |
|
| 76 | +define('KW_CHINA', 50); |
|
| 77 | +define('KW_U_DAYTON', 51); |
|
| 78 | +define('KW_WRIGHT_STATE', 52); |
|
| 79 | +define('KW_USC', 53); |
|
| 80 | +define('KW_FULLERTON', 54); |
|
| 81 | +define('KW_ARIZONA_STATE', 55); |
|
| 82 | +define('KW_U_ILLINOIS', 56); |
|
| 83 | +define('KW_U_WARSAW', 57); |
|
| 84 | +define('KW_RPI', 58); |
|
| 85 | +define('KW_INTERNATIONAL', 59); |
|
| 86 | +define('KW_UND', 60); |
|
| 87 | +define('KW_HOLLAND', 61); |
|
| 88 | +define('KW_CHEMISTRY', 62); |
|
| 89 | +define('KW_GAMES', 63); |
|
| 90 | +define('KW_VIRUS', 64); |
|
| 91 | +define('KW_FRANCE', 65); |
|
| 92 | 92 | |
| 93 | 93 | $job_keywords = array(); |
| 94 | 94 | |
@@ -63,13 +63,13 @@ discard block |
||
| 63 | 63 | global $language_names; |
| 64 | 64 | $supported_languages = get_supported_languages(); |
| 65 | 65 | $supported_languages[] = "en"; |
| 66 | - $sel = $cur_lang_name?"":"selected"; |
|
| 66 | + $sel = $cur_lang_name ? "" : "selected"; |
|
| 67 | 67 | echo " |
| 68 | 68 | <option $sel value=auto>Language: default |
| 69 | 69 | "; |
| 70 | 70 | foreach ($language_names as $lang) { |
| 71 | 71 | if (!in_array($lang[0], $supported_languages)) continue; |
| 72 | - $sel = ($cur_lang_name == $lang[0])?"selected":""; |
|
| 72 | + $sel = ($cur_lang_name == $lang[0]) ? "selected" : ""; |
|
| 73 | 73 | if ($lang[0] == "en") { |
| 74 | 74 | echo "<option $sel value=".$lang[0].">".$lang[1]; |
| 75 | 75 | } else { |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | // show a menu of supported languages |
| 83 | 83 | // |
| 84 | -function language_form($cur_lang_name=null) { |
|
| 84 | +function language_form($cur_lang_name = null) { |
|
| 85 | 85 | echo ' |
| 86 | 86 | <form name="language" method="get" action="set_language.php"> |
| 87 | 87 | <select class="selectbox form-control" name="lang" onchange="javascript: submit()"> |
@@ -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 | global $master_url; |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | // output a panel. |
| 215 | 215 | // $content_func is a function that generates the panel contents |
| 216 | 216 | // |
| 217 | -function panel($title, $content_func, $class="panel-primary", $body_class="") { |
|
| 217 | +function panel($title, $content_func, $class = "panel-primary", $body_class = "") { |
|
| 218 | 218 | echo sprintf('<div class="panel %s"> |
| 219 | 219 | ', $class |
| 220 | 220 | ); |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | // are functions that generate the top, left, and right content |
| 241 | 241 | // $left_width is the width of left column in 1/12 units. |
| 242 | 242 | // |
| 243 | -function grid($top_func, $left_func, $right_func, $left_width=6) { |
|
| 243 | +function grid($top_func, $left_func, $right_func, $left_width = 6) { |
|
| 244 | 244 | echo ' |
| 245 | 245 | <div class="container-fluid"> |
| 246 | 246 | '; |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | </div> |
| 256 | 256 | '; |
| 257 | 257 | } |
| 258 | - $right_width = 12-$left_width; |
|
| 258 | + $right_width = 12 - $left_width; |
|
| 259 | 259 | echo ' |
| 260 | 260 | <div class="row"> |
| 261 | 261 | <div class="col-sm-'.$left_width.'"> |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | '; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | -function form_start($action, $method='get') { |
|
| 276 | +function form_start($action, $method = 'get') { |
|
| 277 | 277 | echo sprintf( |
| 278 | 278 | '<div class="container"> |
| 279 | 279 | <form class="form-horizontal" method="%s" action="%s">' |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | define('FORM_LEFT_OFFSET', 'col-sm-offset-4'); |
| 298 | 298 | define('FORM_RIGHT_CLASS', 'col-sm-8'); |
| 299 | 299 | |
| 300 | -function form_input_text($label, $name, $value='', $type='text', $attrs='', $extra='') { |
|
| 300 | +function form_input_text($label, $name, $value = '', $type = 'text', $attrs = '', $extra = '') { |
|
| 301 | 301 | echo sprintf(' |
| 302 | 302 | <div class="form-group"> |
| 303 | 303 | <label class="control-label %s">%s</label> |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | ); |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | -function form_input_textarea($label, $name, $value='') { |
|
| 327 | +function form_input_textarea($label, $name, $value = '') { |
|
| 328 | 328 | echo sprintf(' |
| 329 | 329 | <div class="form-group"> |
| 330 | 330 | <label class="control-label %s" for="%s">%s</label> |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | ); |
| 374 | 374 | $n = 0; |
| 375 | 375 | foreach ($items as $i) { |
| 376 | - $s = ($flags && $flags[$n])?'selected':''; |
|
| 376 | + $s = ($flags && $flags[$n]) ? 'selected' : ''; |
|
| 377 | 377 | echo '<option '.$s.' value="'.$i[0].'">'.$i[1].'</option> |
| 378 | 378 | '; |
| 379 | 379 | $n++; |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | |
| 384 | 384 | // $items is list of (name, label, checked) |
| 385 | 385 | // |
| 386 | -function form_checkboxes($label, $items, $attrs='') { |
|
| 386 | +function form_checkboxes($label, $items, $attrs = '') { |
|
| 387 | 387 | echo sprintf(' |
| 388 | 388 | <div class="form-group"> |
| 389 | 389 | <label class="control-label %s">%s</label> |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | } |
| 401 | 401 | echo sprintf('<input %s type="checkbox" name="%s" %s> %s |
| 402 | 402 | ', |
| 403 | - $attrs, $i[0], $i[2]?"checked":"", $i[1] |
|
| 403 | + $attrs, $i[0], $i[2] ? "checked" : "", $i[1] |
|
| 404 | 404 | ); |
| 405 | 405 | } |
| 406 | 406 | echo '</div> |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS |
| 420 | 420 | ); |
| 421 | 421 | foreach ($items as $i) { |
| 422 | - $checked = ($selected == $i[0])?"checked":""; |
|
| 422 | + $checked = ($selected == $i[0]) ? "checked" : ""; |
|
| 423 | 423 | echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br> |
| 424 | 424 | ', |
| 425 | 425 | $name, $i[0], $checked, $i[1] |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | '; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | -function form_submit($text, $attrs='') { |
|
| 455 | +function form_submit($text, $attrs = '') { |
|
| 456 | 456 | form_general( |
| 457 | 457 | "", |
| 458 | 458 | sprintf('<button %s type="submit" class="btn btn-success">%s</button>', |
@@ -461,11 +461,11 @@ discard block |
||
| 461 | 461 | ); |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | -function form_checkbox($label, $name, $checked=false) { |
|
| 464 | +function form_checkbox($label, $name, $checked = false) { |
|
| 465 | 465 | echo sprintf(' |
| 466 | 466 | <div class="form-group"> |
| 467 | 467 | <input type="checkbox" name="%s" %s> <span class="lead">%s</span> |
| 468 | 468 | </div> |
| 469 | - ', $name, $checked?"checked":"", $label |
|
| 469 | + ', $name, $checked ? "checked" : "", $label |
|
| 470 | 470 | ); |
| 471 | 471 | } |
@@ -69,13 +69,13 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | function __construct() |
| 71 | 71 | { |
| 72 | - $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST']; |
|
| 72 | + $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST']; |
|
| 73 | 73 | $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?'); |
| 74 | - $this->returnUrl = $this->trustRoot . $uri; |
|
| 74 | + $this->returnUrl = $this->trustRoot.$uri; |
|
| 75 | 75 | |
| 76 | 76 | $this->data = $_POST + $_GET; # OPs may send data as POST or GET. |
| 77 | 77 | |
| 78 | - if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) { |
|
| 78 | + if (!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) { |
|
| 79 | 79 | throw new ErrorException('You must have either https wrappers or curl enabled.'); |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | { |
| 85 | 85 | switch ($name) { |
| 86 | 86 | case 'identity': |
| 87 | - if (strlen($value = trim((String) $value))) { |
|
| 87 | + if (strlen($value = trim((String)$value))) { |
|
| 88 | 88 | if (preg_match('#^xri:/*#i', $value, $m)) { |
| 89 | 89 | $value = substr($value, strlen($m[0])); |
| 90 | 90 | } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) { |
@@ -139,23 +139,23 @@ discard block |
||
| 139 | 139 | return !!gethostbynamel($server); |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - protected function request_curl($url, $method='GET', $params=array()) |
|
| 142 | + protected function request_curl($url, $method = 'GET', $params = array()) |
|
| 143 | 143 | { |
| 144 | 144 | $params = http_build_query($params, '', '&'); |
| 145 | - $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : '')); |
|
| 145 | + $curl = curl_init($url.($method == 'GET' && $params ? '?'.$params : '')); |
|
| 146 | 146 | curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); |
| 147 | 147 | curl_setopt($curl, CURLOPT_HEADER, false); |
| 148 | 148 | curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); |
| 149 | 149 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 150 | 150 | curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*')); |
| 151 | 151 | |
| 152 | - if($this->verify_peer !== null) { |
|
| 152 | + if ($this->verify_peer !== null) { |
|
| 153 | 153 | curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer); |
| 154 | - if($this->capath) { |
|
| 154 | + if ($this->capath) { |
|
| 155 | 155 | curl_setopt($curl, CURLOPT_CAPATH, $this->capath); |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - if($this->cainfo) { |
|
| 158 | + if ($this->cainfo) { |
|
| 159 | 159 | curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo); |
| 160 | 160 | } |
| 161 | 161 | } |
@@ -171,17 +171,17 @@ discard block |
||
| 171 | 171 | } |
| 172 | 172 | $response = curl_exec($curl); |
| 173 | 173 | |
| 174 | - if($method == 'HEAD') { |
|
| 174 | + if ($method == 'HEAD') { |
|
| 175 | 175 | $headers = array(); |
| 176 | - foreach(explode("\n", $response) as $header) { |
|
| 177 | - $pos = strpos($header,':'); |
|
| 176 | + foreach (explode("\n", $response) as $header) { |
|
| 177 | + $pos = strpos($header, ':'); |
|
| 178 | 178 | $name = strtolower(trim(substr($header, 0, $pos))); |
| 179 | - $headers[$name] = trim(substr($header, $pos+1)); |
|
| 179 | + $headers[$name] = trim(substr($header, $pos + 1)); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | # Updating claimed_id in case of redirections. |
| 183 | 183 | $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL); |
| 184 | - if($effective_url != $url) { |
|
| 184 | + if ($effective_url != $url) { |
|
| 185 | 185 | $this->identity = $this->claimed_id = $effective_url; |
| 186 | 186 | } |
| 187 | 187 | |
@@ -195,14 +195,14 @@ discard block |
||
| 195 | 195 | return $response; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | - protected function request_streams($url, $method='GET', $params=array()) |
|
| 198 | + protected function request_streams($url, $method = 'GET', $params = array()) |
|
| 199 | 199 | { |
| 200 | - if(!$this->hostExists($url)) { |
|
| 200 | + if (!$this->hostExists($url)) { |
|
| 201 | 201 | throw new ErrorException('Invalid request.'); |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | $params = http_build_query($params, '', '&'); |
| 205 | - switch($method) { |
|
| 205 | + switch ($method) { |
|
| 206 | 206 | case 'GET': |
| 207 | 207 | $opts = array( |
| 208 | 208 | 'http' => array( |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | 'ignore_errors' => true, |
| 212 | 212 | ) |
| 213 | 213 | ); |
| 214 | - $url = $url . ($params ? '?' . $params : ''); |
|
| 214 | + $url = $url.($params ? '?'.$params : ''); |
|
| 215 | 215 | break; |
| 216 | 216 | case 'POST': |
| 217 | 217 | $opts = array( |
@@ -236,31 +236,31 @@ discard block |
||
| 236 | 236 | )) |
| 237 | 237 | ); |
| 238 | 238 | |
| 239 | - $url = $url . ($params ? '?' . $params : ''); |
|
| 240 | - $headers_tmp = get_headers ($url); |
|
| 241 | - if(!$headers_tmp) { |
|
| 239 | + $url = $url.($params ? '?'.$params : ''); |
|
| 240 | + $headers_tmp = get_headers($url); |
|
| 241 | + if (!$headers_tmp) { |
|
| 242 | 242 | return array(); |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | # Parsing headers. |
| 246 | 246 | $headers = array(); |
| 247 | - foreach($headers_tmp as $header) { |
|
| 248 | - $pos = strpos($header,':'); |
|
| 247 | + foreach ($headers_tmp as $header) { |
|
| 248 | + $pos = strpos($header, ':'); |
|
| 249 | 249 | $name = strtolower(trim(substr($header, 0, $pos))); |
| 250 | - $headers[$name] = trim(substr($header, $pos+1)); |
|
| 250 | + $headers[$name] = trim(substr($header, $pos + 1)); |
|
| 251 | 251 | |
| 252 | 252 | # Following possible redirections. The point is just to have |
| 253 | 253 | # claimed_id change with them, because get_headers() will |
| 254 | 254 | # follow redirections automatically. |
| 255 | 255 | # We ignore redirections with relative paths. |
| 256 | 256 | # If any known provider uses them, file a bug report. |
| 257 | - if($name == 'location') { |
|
| 258 | - if(strpos($headers[$name], 'http') === 0) { |
|
| 257 | + if ($name == 'location') { |
|
| 258 | + if (strpos($headers[$name], 'http') === 0) { |
|
| 259 | 259 | $this->identity = $this->claimed_id = $headers[$name]; |
| 260 | - } elseif($headers[$name][0] == '/') { |
|
| 260 | + } elseif ($headers[$name][0] == '/') { |
|
| 261 | 261 | $parsed_url = parse_url($this->claimed_id); |
| 262 | 262 | $this->identity = |
| 263 | - $this->claimed_id = $parsed_url['scheme'] . '://' |
|
| 263 | + $this->claimed_id = $parsed_url['scheme'].'://' |
|
| 264 | 264 | . $parsed_url['host'] |
| 265 | 265 | . $headers[$name]; |
| 266 | 266 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | return $headers; |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | - if($this->verify_peer) { |
|
| 275 | + if ($this->verify_peer) { |
|
| 276 | 276 | $opts += array('ssl' => array( |
| 277 | 277 | 'verify_peer' => true, |
| 278 | 278 | 'capath' => $this->capath, |
@@ -280,14 +280,14 @@ discard block |
||
| 280 | 280 | )); |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - $context = stream_context_create ($opts); |
|
| 283 | + $context = stream_context_create($opts); |
|
| 284 | 284 | |
| 285 | 285 | return file_get_contents($url, false, $context); |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - protected function request($url, $method='GET', $params=array()) |
|
| 288 | + protected function request($url, $method = 'GET', $params = array()) |
|
| 289 | 289 | { |
| 290 | - if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) { |
|
| 290 | + if (function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) { |
|
| 291 | 291 | return $this->request_curl($url, $method, $params); |
| 292 | 292 | } |
| 293 | 293 | return $this->request_streams($url, $method, $params); |
@@ -296,19 +296,19 @@ discard block |
||
| 296 | 296 | protected function build_url($url, $parts) |
| 297 | 297 | { |
| 298 | 298 | if (isset($url['query'], $parts['query'])) { |
| 299 | - $parts['query'] = $url['query'] . '&' . $parts['query']; |
|
| 299 | + $parts['query'] = $url['query'].'&'.$parts['query']; |
|
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | $url = $parts + $url; |
| 303 | - $url = $url['scheme'] . '://' |
|
| 304 | - . (empty($url['username'])?'' |
|
| 305 | - :(empty($url['password'])? "{$url['username']}@" |
|
| 303 | + $url = $url['scheme'].'://' |
|
| 304 | + . (empty($url['username']) ? '' |
|
| 305 | + :(empty($url['password']) ? "{$url['username']}@" |
|
| 306 | 306 | :"{$url['username']}:{$url['password']}@")) |
| 307 | 307 | . $url['host'] |
| 308 | - . (empty($url['port'])?'':":{$url['port']}") |
|
| 309 | - . (empty($url['path'])?'':$url['path']) |
|
| 310 | - . (empty($url['query'])?'':"?{$url['query']}") |
|
| 311 | - . (empty($url['fragment'])?'':"#{$url['fragment']}"); |
|
| 308 | + . (empty($url['port']) ? '' : ":{$url['port']}") |
|
| 309 | + . (empty($url['path']) ? '' : $url['path']) |
|
| 310 | + . (empty($url['query']) ? '' : "?{$url['query']}") |
|
| 311 | + . (empty($url['fragment']) ? '' : "#{$url['fragment']}"); |
|
| 312 | 312 | return $url; |
| 313 | 313 | } |
| 314 | 314 | |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2); |
| 323 | 323 | |
| 324 | 324 | $result = array_merge($matches1[1], $matches2[1]); |
| 325 | - return empty($result)?false:$result[0]; |
|
| 325 | + return empty($result) ?false:$result[0]; |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | /** |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | $yadis = true; |
| 349 | 349 | |
| 350 | 350 | # We'll jump a maximum of 5 times, to avoid endless redirections. |
| 351 | - for ($i = 0; $i < 5; $i ++) { |
|
| 351 | + for ($i = 0; $i < 5; $i++) { |
|
| 352 | 352 | if ($yadis) { |
| 353 | 353 | $headers = $this->request($url, 'HEAD'); |
| 354 | 354 | |
@@ -370,12 +370,12 @@ discard block |
||
| 370 | 370 | $content = $this->request($url, 'GET'); |
| 371 | 371 | |
| 372 | 372 | preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m); |
| 373 | - foreach($m[1] as $content) { |
|
| 374 | - $content = ' ' . $content; # The space is added, so that strpos doesn't return 0. |
|
| 373 | + foreach ($m[1] as $content) { |
|
| 374 | + $content = ' '.$content; # The space is added, so that strpos doesn't return 0. |
|
| 375 | 375 | |
| 376 | 376 | # OpenID 2 |
| 377 | 377 | $ns = preg_quote('http://specs.openid.net/auth/2.0/'); |
| 378 | - if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) { |
|
| 378 | + if (preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) { |
|
| 379 | 379 | if ($type[1] == 'server') $this->identifier_select = true; |
| 380 | 380 | |
| 381 | 381 | preg_match('#<URI.*?>(.*)</URI>#', $content, $server); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | return false; |
| 385 | 385 | } |
| 386 | 386 | # Does the server advertise support for either AX or SREG? |
| 387 | - $this->ax = (bool) strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>'); |
|
| 387 | + $this->ax = (bool)strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>'); |
|
| 388 | 388 | $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>') |
| 389 | 389 | || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>'); |
| 390 | 390 | |
@@ -498,33 +498,33 @@ discard block |
||
| 498 | 498 | if ($this->required || $this->optional) { |
| 499 | 499 | $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0'; |
| 500 | 500 | $params['openid.ax.mode'] = 'fetch_request'; |
| 501 | - $this->aliases = array(); |
|
| 501 | + $this->aliases = array(); |
|
| 502 | 502 | $counts = array(); |
| 503 | 503 | $required = array(); |
| 504 | 504 | $optional = array(); |
| 505 | - foreach (array('required','optional') as $type) { |
|
| 505 | + foreach (array('required', 'optional') as $type) { |
|
| 506 | 506 | foreach ($this->$type as $alias => $field) { |
| 507 | 507 | if (is_int($alias)) $alias = strtr($field, '/', '_'); |
| 508 | - $this->aliases[$alias] = 'http://axschema.org/' . $field; |
|
| 508 | + $this->aliases[$alias] = 'http://axschema.org/'.$field; |
|
| 509 | 509 | if (empty($counts[$alias])) $counts[$alias] = 0; |
| 510 | 510 | $counts[$alias] += 1; |
| 511 | 511 | ${$type}[] = $alias; |
| 512 | 512 | } |
| 513 | 513 | } |
| 514 | 514 | foreach ($this->aliases as $alias => $ns) { |
| 515 | - $params['openid.ax.type.' . $alias] = $ns; |
|
| 515 | + $params['openid.ax.type.'.$alias] = $ns; |
|
| 516 | 516 | } |
| 517 | 517 | foreach ($counts as $alias => $count) { |
| 518 | 518 | if ($count == 1) continue; |
| 519 | - $params['openid.ax.count.' . $alias] = $count; |
|
| 519 | + $params['openid.ax.count.'.$alias] = $count; |
|
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | # Don't send empty ax.requied and ax.if_available. |
| 523 | 523 | # Google and possibly other providers refuse to support ax when one of these is empty. |
| 524 | - if($required) { |
|
| 524 | + if ($required) { |
|
| 525 | 525 | $params['openid.ax.required'] = implode(',', $required); |
| 526 | 526 | } |
| 527 | - if($optional) { |
|
| 527 | + if ($optional) { |
|
| 528 | 528 | $params['openid.ax.if_available'] = implode(',', $optional); |
| 529 | 529 | } |
| 530 | 530 | } |
@@ -537,8 +537,8 @@ discard block |
||
| 537 | 537 | # If we have an openid.delegate that is different from our claimed id, |
| 538 | 538 | # we need to somehow preserve the claimed id between requests. |
| 539 | 539 | # The simplest way is to just send it along with the return_to url. |
| 540 | - if($this->identity != $this->claimed_id) { |
|
| 541 | - $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id; |
|
| 540 | + if ($this->identity != $this->claimed_id) { |
|
| 541 | + $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?').'openid.claimed_id='.$this->claimed_id; |
|
| 542 | 542 | } |
| 543 | 543 | |
| 544 | 544 | $params = array( |
@@ -612,15 +612,15 @@ discard block |
||
| 612 | 612 | # by presenting user_setup_url (for 1.1) or reporting |
| 613 | 613 | # mode 'setup_needed' (for 2.0). Also catching all modes other than |
| 614 | 614 | # id_res, in order to avoid throwing errors. |
| 615 | - if(isset($this->data['openid_user_setup_url'])) { |
|
| 615 | + if (isset($this->data['openid_user_setup_url'])) { |
|
| 616 | 616 | $this->setup_url = $this->data['openid_user_setup_url']; |
| 617 | 617 | return false; |
| 618 | 618 | } |
| 619 | - if($this->mode != 'id_res') { |
|
| 619 | + if ($this->mode != 'id_res') { |
|
| 620 | 620 | return false; |
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - $this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity']; |
|
| 623 | + $this->claimed_id = isset($this->data['openid_claimed_id']) ? $this->data['openid_claimed_id'] : $this->data['openid_identity']; |
|
| 624 | 624 | $params = array( |
| 625 | 625 | 'openid.assoc_handle' => $this->data['openid_assoc_handle'], |
| 626 | 626 | 'openid.signed' => $this->data['openid_signed'], |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | # If it's an OpenID 1 provider, and we've got claimed_id, |
| 639 | 639 | # we have to append it to the returnUrl, like authUrl_v1 does. |
| 640 | 640 | $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?') |
| 641 | - . 'openid.claimed_id=' . $this->claimed_id; |
|
| 641 | + . 'openid.claimed_id='.$this->claimed_id; |
|
| 642 | 642 | } |
| 643 | 643 | |
| 644 | 644 | if ($this->data['openid_return_to'] != $this->returnUrl) { |
@@ -656,8 +656,8 @@ discard block |
||
| 656 | 656 | # In such case, validation would fail, since we'd send different data than OP |
| 657 | 657 | # wants to verify. stripslashes() should solve that problem, but we can't |
| 658 | 658 | # use it when magic_quotes is off. |
| 659 | - $value = $this->data['openid_' . str_replace('.','_',$item)]; |
|
| 660 | - $params['openid.' . $item] = (version_compare(PHP_VERSION, '5.4.0') < 0 && get_magic_quotes_gpc()) ? stripslashes($value) : $value; |
|
| 659 | + $value = $this->data['openid_'.str_replace('.', '_', $item)]; |
|
| 660 | + $params['openid.'.$item] = (version_compare(PHP_VERSION, '5.4.0') < 0 && get_magic_quotes_gpc()) ? stripslashes($value) : $value; |
|
| 661 | 661 | |
| 662 | 662 | } |
| 663 | 663 | |
@@ -695,18 +695,18 @@ discard block |
||
| 695 | 695 | |
| 696 | 696 | $attributes = array(); |
| 697 | 697 | foreach ($this->data as $key => $value) { |
| 698 | - $keyMatch = 'openid_' . $alias . '_value_'; |
|
| 698 | + $keyMatch = 'openid_'.$alias.'_value_'; |
|
| 699 | 699 | if (substr($key, 0, strlen($keyMatch)) != $keyMatch) { |
| 700 | 700 | continue; |
| 701 | 701 | } |
| 702 | 702 | $key = substr($key, strlen($keyMatch)); |
| 703 | - if (!isset($this->data['openid_' . $alias . '_type_' . $key])) { |
|
| 703 | + if (!isset($this->data['openid_'.$alias.'_type_'.$key])) { |
|
| 704 | 704 | # OP is breaking the spec by returning a field without |
| 705 | 705 | # associated ns. This shouldn't happen, but it's better |
| 706 | 706 | # to check, than cause an E_NOTICE. |
| 707 | 707 | continue; |
| 708 | 708 | } |
| 709 | - $key = substr($this->data['openid_' . $alias . '_type_' . $key], |
|
| 709 | + $key = substr($this->data['openid_'.$alias.'_type_'.$key], |
|
| 710 | 710 | strlen('http://axschema.org/')); |
| 711 | 711 | $attributes[$key] = $value; |
| 712 | 712 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | // |
| 65 | 65 | function get_platform($user_agent) { |
| 66 | 66 | if (strstr($user_agent, 'Windows')) { |
| 67 | - if (strstr($user_agent, 'Win64')||strstr($user_agent, 'WOW64')) { |
|
| 67 | + if (strstr($user_agent, 'Win64') || strstr($user_agent, 'WOW64')) { |
|
| 68 | 68 | return 'windows_x86_64'; |
| 69 | 69 | } else { |
| 70 | 70 | return 'windows_intelx86'; |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $token, |
| 139 | 139 | $user->id, |
| 140 | 140 | (string)$v->filename, |
| 141 | - $green?"btn-success":"btn-info", |
|
| 141 | + $green ? "btn-success" : "btn-info", |
|
| 142 | 142 | (string)$v->platform, |
| 143 | 143 | (string)$v->size_mb, |
| 144 | 144 | (string)$v->version_num |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | function download_button_vbox($v, $project_id, $token, $user) { |
| 149 | 149 | // if no vbox version exists for platform, don't show vbox button |
| 150 | - if(!$v->vbox_filename) { |
|
| 150 | + if (!$v->vbox_filename) { |
|
| 151 | 151 | return; |
| 152 | 152 | } |
| 153 | 153 | return sprintf( |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | handle_get_info(); |
| 437 | 437 | } else { |
| 438 | 438 | $dev = get_str("dev", true); |
| 439 | - $user_agent = get_str("user_agent", true); // for debugging |
|
| 439 | + $user_agent = get_str("user_agent", true); // for debugging |
|
| 440 | 440 | if (!$user_agent) { |
| 441 | 441 | $user_agent = $_SERVER['HTTP_USER_AGENT']; |
| 442 | 442 | } |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | // Adapt to your web site. The following assumes Bootstrap. |
| 137 | 137 | // |
| 138 | 138 | function show_download_button($info, $is_vbox) { |
| 139 | - $desc = $is_vbox?$info->boinc_vbox:$info->boinc; |
|
| 139 | + $desc = $is_vbox ? $info->boinc_vbox : $info->boinc; |
|
| 140 | 140 | echo sprintf(' |
| 141 | 141 | <form action="https://boinc.berkeley.edu/concierge.php" method="post"> |
| 142 | 142 | <input type=hidden name=project_id value="%d"> |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | (string)$info->token, |
| 151 | 151 | (int)$info->user_id, |
| 152 | 152 | (string)$desc->filename, |
| 153 | - $is_vbox?" + VirtualBox":"", |
|
| 153 | + $is_vbox ? " + VirtualBox" : "", |
|
| 154 | 154 | (string)$info->platform, |
| 155 | 155 | (string)$desc->size_mb |
| 156 | 156 | ); |