GEANT /
CAT
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | <table><tr> |
| 293 | 293 | <td class='icon_td'>"; |
| 294 | 294 | $out[] = "<img src='".$this->stateIcons[$this->globalLevelStatic]."' id='main_static_ico' class='icon'></td><td id='main_static_result'>". |
| 295 | - $this->globalInfo[$this->globalLevelStatic].' '. _("See the appropriate tab for details.").'</td> |
|
| 295 | + $this->globalInfo[$this->globalLevelStatic].' '._("See the appropriate tab for details.").'</td> |
|
| 296 | 296 | </tr></table>'; |
| 297 | 297 | if ($this->naptr > 0) { |
| 298 | 298 | $out[] = "<hr><strong>"._("Dynamic connectivity tests")."</strong> |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | <td class='icon_td'><img src='".$this->stateIcons[$result->level]."' id='src".$hostindex."_img'></td> |
| 324 | 324 | <td id='src$hostindex' colspan=2> |
| 325 | 325 | "; |
| 326 | - $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf (_("elapsed time: %sms."), $result->time_millisec).'<p>'.$result->message.'</p>'; |
|
| 326 | + $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf(_("elapsed time: %sms."), $result->time_millisec).'<p>'.$result->message.'</p>'; |
|
| 327 | 327 | |
| 328 | 328 | if ($result->level > \core\common\Entity::L_OK && property_exists($result, 'cert_oddities')) { |
| 329 | 329 | foreach ($result->cert_oddities as $oddities) { |
@@ -373,10 +373,10 @@ discard block |
||
| 373 | 373 | if (isset($this->protocolsMap[$capath->IP]) && $this->protocolsMap[$capath->IP] != '') { |
| 374 | 374 | $prots = explode(';', $this->protocolsMap[$capath->IP]); |
| 375 | 375 | if (!empty($prots)) { |
| 376 | - $capathtest[] = ' ' . _("supported TLS protocols: "); |
|
| 376 | + $capathtest[] = ' '._("supported TLS protocols: "); |
|
| 377 | 377 | $capathtest[] = implode(', ', $prots); |
| 378 | 378 | if (!in_array("TLS1.3", $prots)) { |
| 379 | - $capathtest[] = ' ' . '<font color="red">' . _("not supported: ") . 'TLS1.3</font>'; |
|
| 379 | + $capathtest[] = ' '.'<font color="red">'._("not supported: ").'TLS1.3</font>'; |
|
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | } |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | if ($capath->certdata->validTo) { |
| 400 | 400 | $certdesc .= '<li>'.$this->certFields['validTo'].' '. |
| 401 | 401 | date_create_from_format('ymdGis', |
| 402 | - substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s'). ' UTC'; |
|
| 402 | + substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s').' UTC'; |
|
| 403 | 403 | } |
| 404 | 404 | if ($capath->certdata->extensions) { |
| 405 | 405 | if ($capath->certdata->extensions->subjectaltname) { |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | } else { |
| 423 | 423 | $certdesc = '<br>'; |
| 424 | 424 | } |
| 425 | - $capathtest[] = '<div>'.($capath->message!='' ? $capath->message : _('Test failed')).'</div>'.$more; |
|
| 425 | + $capathtest[] = '<div>'.($capath->message != '' ? $capath->message : _('Test failed')).'</div>'.$more; |
|
| 426 | 426 | $capathtest[] = '</td> |
| 427 | 427 | </tr> |
| 428 | 428 | </table>'; |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | $srefused = 0; |
| 450 | 450 | $cliinfo = ''; |
| 451 | 451 | $cliinfo .= '<li>'._('Client certificate').' <b>'.$ca->clientcertinfo->from. |
| 452 | - '</b>'.', '.$ca->clientcertinfo->message . |
|
| 452 | + '</b>'.', '.$ca->clientcertinfo->message. |
|
| 453 | 453 | '<br> (CA: '.$ca->clientcertinfo->issuer.')<ul>'; |
| 454 | 454 | foreach ($ca->certificate as $certificate) { |
| 455 | 455 | if ($certificate->returncode == \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) { |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | } else { |
| 516 | 516 | $cliinfo = _('Test failed'); |
| 517 | 517 | $clientstest[] = "<table><tr><td class='icon_td' id='srcclient".$hostindex."_img'><img src='". |
| 518 | - $this->stateIcons[\core\common\Entity::L_WARN]."'></td>" . |
|
| 518 | + $this->stateIcons[\core\common\Entity::L_WARN]."'></td>". |
|
| 519 | 519 | "<td id='srcclient$hostindex'>$cliinfo</td></tr></table>"; |
| 520 | 520 | } |
| 521 | 521 | } else { |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | $this->relevantNAPTRhostnameResolution(); |
| 439 | 439 | } |
| 440 | 440 | foreach ($this->NAPTR_hostname_records as $hostindex => $addr) { |
| 441 | - $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port']; |
|
| 441 | + $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port']; |
|
| 442 | 442 | $this->NAPTR_hostname_records[$hostindex]['protocols'] = $this->execSslscan($hostindex, $host); |
| 443 | 443 | foreach ($this->NAPTR_hostname_records[$hostindex]['protocols'] as $protocol) { |
| 444 | 444 | if ($protocol['type'] == 'TLS1.3' && $protocol['enabled'] == 1) { |
@@ -458,13 +458,13 @@ discard block |
||
| 458 | 458 | */ |
| 459 | 459 | private function execSslscan($hostindex, $host) |
| 460 | 460 | { |
| 461 | - $this->loggerInstance->debug(4, \config\Master::PATHS['sslscan'] . " --no-heartbleed --no-fallback --connect-timeout=5 --no-ciphersuites --xml=- " . $host . "\n"); |
|
| 461 | + $this->loggerInstance->debug(4, \config\Master::PATHS['sslscan']." --no-heartbleed --no-fallback --connect-timeout=5 --no-ciphersuites --xml=- ".$host."\n"); |
|
| 462 | 462 | $sslscanbabble = []; |
| 463 | 463 | $result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures |
| 464 | - exec(\config\Master::PATHS['sslscan'] . " --no-heartbleed --no-fallback --connect-timeout=5 --no-ciphersuites --xml=- " . $host ." 2>&1", $sslscanbabble, $result); |
|
| 464 | + exec(\config\Master::PATHS['sslscan']." --no-heartbleed --no-fallback --connect-timeout=5 --no-ciphersuites --xml=- ".$host." 2>&1", $sslscanbabble, $result); |
|
| 465 | 465 | $this->loggerInstance->debug(4, 'sslscan result '.implode($sslscanbabble)); |
| 466 | 466 | $xml = simplexml_load_string(implode($sslscanbabble)); |
| 467 | - $resarray = json_decode(json_encode((array)$xml),true); |
|
| 467 | + $resarray = json_decode(json_encode((array) $xml), true); |
|
| 468 | 468 | $prots = []; |
| 469 | 469 | if (!isset($resarray['ssltest'])) { |
| 470 | 470 | $this->NAPTR_hostname_records[$hostindex]['unavailable'] = 1; |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
| 22 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
| 23 | 23 | |
| 24 | 24 | $loggerInstance = new \core\common\Logging(); |
| 25 | 25 | |
@@ -69,13 +69,13 @@ discard block |
||
| 69 | 69 | $dnsChecksOR = new \core\diag\RFC7585Tests($check_realm, "aaa+auth:radius.tls.tcp"); |
| 70 | 70 | } |
| 71 | 71 | } else { |
| 72 | - $error_message = _("You asked for a realm check, but we don't know the realm for this profile!") . "</p>"; |
|
| 72 | + $error_message = _("You asked for a realm check, but we don't know the realm for this profile!")."</p>"; |
|
| 73 | 73 | } |
| 74 | 74 | } else { // someone else's realm, and we don't know anything about it... only shallow checks |
| 75 | 75 | $check_realm = $validator->realm($realm ?? $_SESSION['check_realm'] ?? ""); |
| 76 | 76 | if ($check_realm !== FALSE) { |
| 77 | 77 | $_SESSION['check_realm'] = $check_realm; |
| 78 | - $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm); |
|
| 78 | + $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm); |
|
| 79 | 79 | $dnsChecks = new \core\diag\RFC7585Tests($check_realm); |
| 80 | 80 | } else { |
| 81 | 81 | $error_message = _("No valid realm name given, cannot execute any checks!"); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | var listofcas = "<?php echo _("You should update your list of accredited CAs") ?>"; |
| 128 | 128 | var getitfrom = "<?php echo _("Get it from here.") ?>"; |
| 129 | 129 | var listsource = "<?php echo \config\Diagnostics::RADIUSTESTS['accreditedCAsURL'] ?>"; |
| 130 | - var moretext = "<?php echo _("more") . "»" ?>"; |
|
| 130 | + var moretext = "<?php echo _("more")."»" ?>"; |
|
| 131 | 131 | var lesstext = "<?php echo "«" ?>"; |
| 132 | 132 | var morealltext = "<?php echo _("Show detailed information for all tests") ?>"; |
| 133 | 133 | var unknownca_code = "<?php echo \core\diag\RADIUSTests::CERTPROB_UNKNOWN_CA ?>"; |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | cliinfo = cliinfo + '<li><table><tbody><tr><td class="icon_td"><img class="icon" src="' + icons[level] + '" style="width: 24px;"></td><td>' + state; |
| 275 | - cliinfo = cliinfo + ' <?php echo "(" . sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+' ") . ")"; ?>' + add + '</td></tr>'; |
|
| 275 | + cliinfo = cliinfo + ' <?php echo "(".sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+' ").")"; ?>' + add + '</td></tr>'; |
|
| 276 | 276 | cliinfo = cliinfo + '</tbody></table></ul></li>'; |
| 277 | 277 | if (data.ca[key].certificate[c].finalerror === 1) { |
| 278 | 278 | cliinfo = cliinfo + '<li>' + restskipped + '</li>'; |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | }); |
| 473 | 473 | } |
| 474 | 474 | o = o + cert_data + '</table>'; |
| 475 | - $("#eap_test" + data.hostindex).append('<strong><img style="position: relative; top: 2px;" src="' + icons[v.level] + '"><span style="position: relative; top: -5px; <?php echo $start;?>: 1em">' + v.eap + ' – <?php printf(_("elapsed time: %sms."), "'+v.time_millisec+' ") ?></span></strong><div class="more" style="padding-<?php echo $start;?>: 40px"><div class="morecontent"><div style="display:none; background: #eee;">' + o + '</div><a href="" class="morelink">' + moretext + '</a></div></div>'); |
|
| 475 | + $("#eap_test" + data.hostindex).append('<strong><img style="position: relative; top: 2px;" src="' + icons[v.level] + '"><span style="position: relative; top: -5px; <?php echo $start; ?>: 1em">' + v.eap + ' – <?php printf(_("elapsed time: %sms."), "'+v.time_millisec+' ") ?></span></strong><div class="more" style="padding-<?php echo $start; ?>: 40px"><div class="morecontent"><div style="display:none; background: #eee;">' + o + '</div><a href="" class="morelink">' + moretext + '</a></div></div>'); |
|
| 476 | 476 | }); |
| 477 | 477 | } |
| 478 | 478 | |
@@ -483,8 +483,8 @@ discard block |
||
| 483 | 483 | <?php |
| 484 | 484 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 485 | 485 | print " |
| 486 | -$(\"#live_src" . $hostindex . "_img\").attr('src',icon_loading); |
|
| 487 | -$(\"#live_src" . $hostindex . "_img\").show(); |
|
| 486 | +$(\"#live_src" . $hostindex."_img\").attr('src',icon_loading); |
|
| 487 | +$(\"#live_src" . $hostindex."_img\").show(); |
|
| 488 | 488 | $.ajax({ |
| 489 | 489 | url: 'radius_tests.php?src=0&hostindex=$hostindex&realm='+realm, |
| 490 | 490 | type: 'POST', |
@@ -515,15 +515,15 @@ discard block |
||
| 515 | 515 | <?php |
| 516 | 516 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 517 | 517 | if ($testedProfile !== NULL) { |
| 518 | - $extraarg = "profile_id: " . $testedProfile->identifier . ", "; |
|
| 518 | + $extraarg = "profile_id: ".$testedProfile->identifier.", "; |
|
| 519 | 519 | } else { |
| 520 | 520 | $extraarg = ""; |
| 521 | 521 | } |
| 522 | 522 | print " |
| 523 | -$(\"#src" . $hostindex . "_img\").attr('src',icon_loading); |
|
| 523 | +$(\"#src" . $hostindex."_img\").attr('src',icon_loading); |
|
| 524 | 524 | $(\"#src$hostindex\").html(''); |
| 525 | 525 | running_ajax_stat++; |
| 526 | -$.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex'}, error: eee, success: udp, dataType: 'json'}); |
|
| 526 | +$.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex'}, error: eee, success: udp, dataType: 'json'}); |
|
| 527 | 527 | "; |
| 528 | 528 | } |
| 529 | 529 | ?> |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | if ($check_realm === FALSE) { |
| 552 | 552 | print "<p>$error_message</p>"; |
| 553 | 553 | } else { |
| 554 | - print "<h1>" . sprintf(_("Realm testing for: %s"), $check_realm) . "</h1>\n"; |
|
| 554 | + print "<h1>".sprintf(_("Realm testing for: %s"), $check_realm)."</h1>\n"; |
|
| 555 | 555 | ?> |
| 556 | 556 | <div id="debug_out" style="display: none"></div> |
| 557 | 557 | <div id="tabs" style="min-width: 600px; max-width:1000px"> |
@@ -573,25 +573,25 @@ discard block |
||
| 573 | 573 | // NAPTR existence check |
| 574 | 574 | if ($dynType == "") { |
| 575 | 575 | $rfc7585suite = $dnsChecks; |
| 576 | - echo "<strong>" . _("DNS checks") . "</strong><div>"; |
|
| 576 | + echo "<strong>"._("DNS checks")."</strong><div>"; |
|
| 577 | 577 | } else { |
| 578 | 578 | if (count($orrealm) == 0) { |
| 579 | 579 | continue; |
| 580 | 580 | } |
| 581 | 581 | $rfc7585suite = $dnsChecksOR; |
| 582 | - echo "<strong>" . _("OpenRoaming DNS checks") . "</strong><div>"; |
|
| 582 | + echo "<strong>"._("OpenRoaming DNS checks")."</strong><div>"; |
|
| 583 | 583 | } |
| 584 | 584 | $naptr = $rfc7585suite->relevantNAPTR(); |
| 585 | 585 | if ($naptr == \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) { |
| 586 | 586 | if ($dynType == "") { |
| 587 | - echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>"; |
|
| 587 | + echo "<tr><td>"._("Dynamic discovery test is not configured")."</td><td>"; |
|
| 588 | 588 | } else { |
| 589 | - echo "<tr><td>" . _("OpenRoaming connectivity test is not configured") . "</td><td>"; |
|
| 589 | + echo "<tr><td>"._("OpenRoaming connectivity test is not configured")."</td><td>"; |
|
| 590 | 590 | } |
| 591 | 591 | } else { |
| 592 | 592 | echo "<table>"; |
| 593 | 593 | // output in friendly words |
| 594 | - echo "<tr><td>" . _("Checking NAPTR existence:") . "</td><td>"; |
|
| 594 | + echo "<tr><td>"._("Checking NAPTR existence:")."</td><td>"; |
|
| 595 | 595 | switch ($naptr) { |
| 596 | 596 | case \core\diag\RFC7585Tests::RETVAL_NONAPTR: |
| 597 | 597 | echo _("This realm has no NAPTR records."); |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | |
| 607 | 607 | // compliance checks for NAPTRs |
| 608 | 608 | if ($naptr > 0) { |
| 609 | - echo "<tr><td>" . _("Checking NAPTR compliance (flag = S and regex = {empty}):") . "</td><td>"; |
|
| 609 | + echo "<tr><td>"._("Checking NAPTR compliance (flag = S and regex = {empty}):")."</td><td>"; |
|
| 610 | 610 | $naptr_valid = $rfc7585suite->relevantNAPTRcompliance(); |
| 611 | 611 | switch ($naptr_valid) { |
| 612 | 612 | case \core\diag\RADIUSTests::RETVAL_OK: |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | // SRV resolution |
| 622 | 622 | if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK) { |
| 623 | 623 | $srv = $rfc7585suite->relevantNAPTRsrvResolution(); |
| 624 | - echo "<tr><td>" . _("Checking SRVs:") . "</td><td>"; |
|
| 624 | + echo "<tr><td>"._("Checking SRVs:")."</td><td>"; |
|
| 625 | 625 | switch ($srv) { |
| 626 | 626 | case \core\diag\RADIUSTests::RETVAL_SKIPPED: |
| 627 | 627 | echo _("This check was skipped."); |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | // IP addresses for the hosts |
| 638 | 638 | if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK && $srv > 0) { |
| 639 | 639 | $hosts = $rfc7585suite->relevantNAPTRhostnameResolution(); |
| 640 | - echo "<tr><td>" . _("Checking IP address resolution:") . "</td><td>"; |
|
| 640 | + echo "<tr><td>"._("Checking IP address resolution:")."</td><td>"; |
|
| 641 | 641 | switch ($srv) { |
| 642 | 642 | case \core\diag\RADIUSTests::RETVAL_SKIPPED: |
| 643 | 643 | echo _("This check was skipped."); |
@@ -654,12 +654,12 @@ discard block |
||
| 654 | 654 | echo "</table><br/>"; |
| 655 | 655 | if ($dynType == "") { |
| 656 | 656 | if (count($testsuite->listerrors()) == 0) { |
| 657 | - echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("with no DNS errors encountered. Congratulations!"); |
|
| 657 | + echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("with no DNS errors encountered. Congratulations!"); |
|
| 658 | 658 | } else { |
| 659 | - echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("but there were DNS errors! Check them!") . " " . _("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below."); |
|
| 659 | + echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("but there were DNS errors! Check them!")." "._("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below."); |
|
| 660 | 660 | echo "<div class='notacceptable'><table>"; |
| 661 | 661 | foreach ($testsuite->listerrors() as $details) { |
| 662 | - echo "<tr><td>" . $details['TYPE'] . "</td><td>" . $details['TARGET'] . "</td></tr>"; |
|
| 662 | + echo "<tr><td>".$details['TYPE']."</td><td>".$details['TARGET']."</td></tr>"; |
|
| 663 | 663 | } |
| 664 | 664 | echo "</table></div>"; |
| 665 | 665 | } |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | $("#dynamic_tests").show(); |
| 679 | 679 | '; |
| 680 | 680 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 681 | - $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port']; |
|
| 681 | + $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port']; |
|
| 682 | 682 | $expectedName = $addr['hostname']; |
| 683 | 683 | $ssltest = 1; |
| 684 | 684 | if (isset($addr['unavailable']) && $addr['unavailable']) { |
@@ -696,9 +696,9 @@ discard block |
||
| 696 | 696 | $protstr = implode(';', $protocols); |
| 697 | 697 | print " |
| 698 | 698 | running_ajax_dyn++; |
| 699 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'capath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', expectedname: '$expectedName' }, error: eee, success: capath, dataType: 'json'}); |
|
| 699 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'capath', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', expectedname: '$expectedName' }, error: eee, success: capath, dataType: 'json'}); |
|
| 700 | 700 | running_ajax_dyn++; |
| 701 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'clients', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); |
|
| 701 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'clients', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); |
|
| 702 | 702 | "; |
| 703 | 703 | } |
| 704 | 704 | echo "} |
@@ -714,11 +714,11 @@ discard block |
||
| 714 | 714 | $("#openroaming_tests").show(); |
| 715 | 715 | '; |
| 716 | 716 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 717 | - $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port']; |
|
| 717 | + $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port']; |
|
| 718 | 718 | $expectedName = $addr['hostname']; |
| 719 | 719 | print " |
| 720 | 720 | running_ajax_openroaming++; |
| 721 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'openroamingcapath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', expectedname: '$expectedName' }, error: eee, success: capath, dataType: 'json'}); |
|
| 721 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'openroamingcapath', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', expectedname: '$expectedName' }, error: eee, success: capath, dataType: 'json'}); |
|
| 722 | 722 | "; |
| 723 | 723 | } |
| 724 | 724 | echo "} |
@@ -731,18 +731,18 @@ discard block |
||
| 731 | 731 | $naptrs[1] = $naptr; |
| 732 | 732 | } |
| 733 | 733 | } |
| 734 | - echo "<strong>" . _("Static connectivity tests") . "</strong> |
|
| 734 | + echo "<strong>"._("Static connectivity tests")."</strong> |
|
| 735 | 735 | <table><tr> |
| 736 | 736 | <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_static_ico' class='icon'></td><td id='main_static_result' style='display:none'> </td> |
| 737 | 737 | </tr></table>"; |
| 738 | 738 | if ($naptrs[0] > 0) { |
| 739 | - echo "<hr><strong>" . _("Dynamic connectivity tests") . "</strong> |
|
| 739 | + echo "<hr><strong>"._("Dynamic connectivity tests")."</strong> |
|
| 740 | 740 | <table><tr> |
| 741 | 741 | <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_dynamic_ico' class='icon'></td><td id='main_dynamic_result' style='display:none'> </td> |
| 742 | 742 | </tr></table>"; |
| 743 | 743 | } |
| 744 | 744 | if (isset($orrealm) && count($orrealm) && ($naptrs[1] > 0)) { |
| 745 | - echo "<hr><strong>" . _("OpenRoaming connectivity tests") . "</strong> |
|
| 745 | + echo "<hr><strong>"._("OpenRoaming connectivity tests")."</strong> |
|
| 746 | 746 | <table><tr> |
| 747 | 747 | <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_openroaming_ico' class='icon'></td><td id='main_openroaming_result' style='display:none'> </td> |
| 748 | 748 | </tr></table>"; |
@@ -762,12 +762,12 @@ discard block |
||
| 762 | 762 | print "<p>"; |
| 763 | 763 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 764 | 764 | print "<hr>"; |
| 765 | - printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>"); |
|
| 765 | + printf(_("Testing from: %s"), "<strong>".\config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>"); |
|
| 766 | 766 | print "<table id='results$hostindex' style='width:100%' class='udp_results'> |
| 767 | 767 | <tr> |
| 768 | -<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src" . $hostindex . "_img'></td> |
|
| 768 | +<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src".$hostindex."_img'></td> |
|
| 769 | 769 | <td id='src$hostindex' colspan=2> |
| 770 | -" . _("testing...") . " |
|
| 770 | +"._("testing...")." |
|
| 771 | 771 | </td> |
| 772 | 772 | </tr> |
| 773 | 773 | </table>"; |
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | |
| 779 | 779 | </div> |
| 780 | 780 | <?php |
| 781 | - for ($i=3; $i<5; $i++) { |
|
| 781 | + for ($i = 3; $i < 5; $i++) { |
|
| 782 | 782 | if ($i == 3 && $naptrs[0] <= 0) { |
| 783 | 783 | continue; |
| 784 | 784 | } |
@@ -793,15 +793,15 @@ discard block |
||
| 793 | 793 | $rfc7585suite = $dnsChecksOR; |
| 794 | 794 | } |
| 795 | 795 | ?> |
| 796 | - <div id="tabs-<?php echo $i;?>"> |
|
| 797 | - <button id="run_<?php if ($i==3) echo 'd'; else echo 'o';?>_tests"; onclick="run_<?php if ($i==3) echo 'dynamic'; else echo 'openroaming';?>()"><?php if ($i==3) echo _("Repeat dynamic connectivity tests"); else echo _("Repeat OpenRoaming connectivity tests");?></button> |
|
| 796 | + <div id="tabs-<?php echo $i; ?>"> |
|
| 797 | + <button id="run_<?php if ($i == 3) echo 'd'; else echo 'o'; ?>_tests"; onclick="run_<?php if ($i == 3) echo 'dynamic'; else echo 'openroaming'; ?>()"><?php if ($i == 3) echo _("Repeat dynamic connectivity tests"); else echo _("Repeat OpenRoaming connectivity tests"); ?></button> |
|
| 798 | 798 | |
| 799 | 799 | <?php |
| 800 | 800 | echo "<div id='"; |
| 801 | - if ($i==3) { echo 'dynamic'; } else { echo 'openroaming'; } |
|
| 801 | + if ($i == 3) { echo 'dynamic'; } else { echo 'openroaming'; } |
|
| 802 | 802 | echo "_tests'><fieldset class='option_container'> |
| 803 | 803 | <legend><strong>"; |
| 804 | - if ($i==3) { |
|
| 804 | + if ($i == 3) { |
|
| 805 | 805 | echo _("DYNAMIC connectivity tests"); |
| 806 | 806 | } else { |
| 807 | 807 | echo _("OpenRoaming connectivity tests"); |
@@ -815,11 +815,11 @@ discard block |
||
| 815 | 815 | } |
| 816 | 816 | $resultstoprint = []; |
| 817 | 817 | if (count($rfc7585suite->NAPTR_hostname_records) > 0) { |
| 818 | - $resultstoprint[] = '<div style="align:'.$end.'; display: none;" id="' . $prefix1 . '_result_fail">' . _("Some errors were found during the tests, see below") . '</div><div style="align:'.$end.'; display: none;" id="' . $prefix1 . '_result_pass">' . _("All tests passed, congratulations!") . '</div>'; |
|
| 819 | - $resultstoprint[] = '<div style="align:'.$end.';"><a href="" class="moreall">' . _('Show detailed information for all tests') . '</a></div>' . '<p><strong>' . _("Checking server handshake...") . "</strong><p>"; |
|
| 818 | + $resultstoprint[] = '<div style="align:'.$end.'; display: none;" id="'.$prefix1.'_result_fail">'._("Some errors were found during the tests, see below").'</div><div style="align:'.$end.'; display: none;" id="'.$prefix1.'_result_pass">'._("All tests passed, congratulations!").'</div>'; |
|
| 819 | + $resultstoprint[] = '<div style="align:'.$end.';"><a href="" class="moreall">'._('Show detailed information for all tests').'</a></div>'.'<p><strong>'._("Checking server handshake...")."</strong><p>"; |
|
| 820 | 820 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 821 | - $bracketaddr = ($addr["family"] == "IPv6" ? "[" . $addr["IP"] . "]" : $addr["IP"]); |
|
| 822 | - $resultstoprint[] = '<p><strong>' . $bracketaddr . ' TCP/' . $addr['port'] . '</strong> (' . $addr['hostname'] . ')'; |
|
| 821 | + $bracketaddr = ($addr["family"] == "IPv6" ? "[".$addr["IP"]."]" : $addr["IP"]); |
|
| 822 | + $resultstoprint[] = '<p><strong>'.$bracketaddr.' TCP/'.$addr['port'].'</strong> ('.$addr['hostname'].')'; |
|
| 823 | 823 | $prots = []; |
| 824 | 824 | if (isset($addr['protocols'])) { |
| 825 | 825 | foreach ($addr['protocols'] as $protocol) { |
@@ -829,18 +829,18 @@ discard block |
||
| 829 | 829 | } |
| 830 | 830 | } |
| 831 | 831 | if (!empty($prots)) { |
| 832 | - $resultstoprint[] = ' ' . _("supported TLS protocols: "); |
|
| 832 | + $resultstoprint[] = ' '._("supported TLS protocols: "); |
|
| 833 | 833 | $resultstoprint[] = implode(', ', $prots); |
| 834 | 834 | if (!isset($addr['istls13']) || !$addr['istls13']) { |
| 835 | - $resultstoprint[] = ' ' . '<font color="red">' . _("not supported: ") . 'TLS1.3</font>'; |
|
| 835 | + $resultstoprint[] = ' '.'<font color="red">'._("not supported: ").'TLS1.3</font>'; |
|
| 836 | 836 | } |
| 837 | 837 | } |
| 838 | 838 | $resultstoprint[] = '<ul style="list-style-type: none;" class="caresult"><li>'; |
| 839 | - $resultstoprint[] = "<table id='" . $prefix2 . "caresults$hostindex' style='width:100%'> |
|
| 839 | + $resultstoprint[] = "<table id='".$prefix2."caresults$hostindex' style='width:100%'> |
|
| 840 | 840 | <tr> |
| 841 | -<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='" . $prefix2 . "srcca$hostindex" . "_img'></td> |
|
| 842 | -<td id='" . $prefix2 . "srcca$hostindex'> |
|
| 843 | -" . _("testing...") . " |
|
| 841 | +<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='".$prefix2."srcca$hostindex"."_img'></td> |
|
| 842 | +<td id='" . $prefix2."srcca$hostindex'> |
|
| 843 | +"._("testing...")." |
|
| 844 | 844 | </td> |
| 845 | 845 | </tr> |
| 846 | 846 | </table>"; |
@@ -848,26 +848,26 @@ discard block |
||
| 848 | 848 | } |
| 849 | 849 | $clientstest = []; |
| 850 | 850 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 851 | - $clientstest[] = '<p><strong>' . $addr['IP'] . ' TCP/' . $addr['port'] . '</strong></p><ol>'; |
|
| 852 | - $clientstest[] = "<span id='" . $prefix2 . "clientresults$hostindex'><table style='width:100%'> |
|
| 851 | + $clientstest[] = '<p><strong>'.$addr['IP'].' TCP/'.$addr['port'].'</strong></p><ol>'; |
|
| 852 | + $clientstest[] = "<span id='".$prefix2."clientresults$hostindex'><table style='width:100%'> |
|
| 853 | 853 | <tr> |
| 854 | 854 | <td class='icon_td'>"; |
| 855 | - if ($i == 4 ) { |
|
| 855 | + if ($i == 4) { |
|
| 856 | 856 | $clientstest[] = "<!--"; |
| 857 | 857 | } |
| 858 | - $clientstest[] = "<img src='../resources/images/icons/loading51.gif' id='" . $prefix2 . "srcclient$hostindex" . "_img'></td> |
|
| 859 | -<td id='" . $prefix2 . "srcclient$hostindex'> |
|
| 860 | -" . _("testing..."); |
|
| 858 | + $clientstest[] = "<img src='../resources/images/icons/loading51.gif' id='".$prefix2."srcclient$hostindex"."_img'></td> |
|
| 859 | +<td id='" . $prefix2."srcclient$hostindex'> |
|
| 860 | +"._("testing..."); |
|
| 861 | 861 | |
| 862 | - if ($i == 4 ) { |
|
| 863 | - $clientstest[] = "-->" . _("not implemented yet"); |
|
| 862 | + if ($i == 4) { |
|
| 863 | + $clientstest[] = "-->"._("not implemented yet"); |
|
| 864 | 864 | } |
| 865 | 865 | $clientstest[] = "</td></tr></table></span>"; |
| 866 | 866 | $clientstest[] = '</ol>'; |
| 867 | 867 | } |
| 868 | 868 | echo '<div style="align:'.$end.';">'; |
| 869 | 869 | echo join('', $resultstoprint); |
| 870 | - echo '<span id="' . $prefix2 . 'clientstest" style="display: none;"><p><hr><b>' . _('Checking if certificates from CAs are accepted...') . '</b><p>' . _('A few client certificates will be tested to check if servers are resistant to some certificate problems.') . '<p>'; |
|
| 870 | + echo '<span id="'.$prefix2.'clientstest" style="display: none;"><p><hr><b>'._('Checking if certificates from CAs are accepted...').'</b><p>'._('A few client certificates will be tested to check if servers are resistant to some certificate problems.').'<p>'; |
|
| 871 | 871 | print join('', $clientstest); |
| 872 | 872 | echo '</span>'; |
| 873 | 873 | echo '</div>'; |
@@ -881,7 +881,7 @@ discard block |
||
| 881 | 881 | // check if truncates/dies on Operator-Name |
| 882 | 882 | if ($my_profile !== NULL) { |
| 883 | 883 | echo "<div id='tabs-n'><fieldset class='option_container'> |
| 884 | - <legend><strong>" . _("Live login test") . "</strong></legend>"; |
|
| 884 | + <legend><strong>" . _("Live login test")."</strong></legend>"; |
|
| 885 | 885 | $prof_compl = $my_profile->getEapMethodsinOrderOfPreference(1); |
| 886 | 886 | if (count($prof_compl) > 0) { |
| 887 | 887 | $passwordReqired = FALSE; |
@@ -894,34 +894,34 @@ discard block |
||
| 894 | 894 | $clientCertRequired = TRUE; |
| 895 | 895 | } |
| 896 | 896 | } |
| 897 | - echo "<div id='disposable_credential_container'><p>" . _("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.") . "</p> |
|
| 898 | - <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.") . "</p> |
|
| 899 | - <p>" . _("Note: the tool purposefully does not offer you to save these credentials, and they will never be saved in any way on the server side. Please use only <strong>temporary test accounts</strong> here; permanently valid test accounts in the wild are considered harmful!") . "</p></div> |
|
| 897 | + echo "<div id='disposable_credential_container'><p>"._("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.")."</p> |
|
| 898 | + <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.")."</p> |
|
| 899 | + <p>" . _("Note: the tool purposefully does not offer you to save these credentials, and they will never be saved in any way on the server side. Please use only <strong>temporary test accounts</strong> here; permanently valid test accounts in the wild are considered harmful!")."</p></div> |
|
| 900 | 900 | <form enctype='multipart/form-data' id='live_form' accept-charset='UTF-8'> |
| 901 | 901 | <input type='hidden' name='test_type' value='udp_login'> |
| 902 | - <input type='hidden' name='lang' value='" . $gui->languageInstance->getLang() . "'> |
|
| 903 | - <input type='hidden' name='profile_id' value='" . $my_profile->identifier . "'> |
|
| 902 | + <input type='hidden' name='lang' value='" . $gui->languageInstance->getLang()."'> |
|
| 903 | + <input type='hidden' name='profile_id' value='" . $my_profile->identifier."'> |
|
| 904 | 904 | <table id='live_tests'>"; |
| 905 | 905 | // if any password based EAP methods are available enable this section |
| 906 | 906 | if ($passwordReqired) { |
| 907 | - echo "<tr><td colspan='2'><strong>" . _("Password-based EAP types") . "</strong></td></tr> |
|
| 908 | - <tr><td>" . _("Real (inner) username:") . "</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>"; |
|
| 909 | - echo "<tr><td>" . _("Anonymous outer ID (optional):") . "</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>"; |
|
| 910 | - echo "<tr><td>" . _("Password:") . "</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>"; |
|
| 907 | + echo "<tr><td colspan='2'><strong>"._("Password-based EAP types")."</strong></td></tr> |
|
| 908 | + <tr><td>" . _("Real (inner) username:")."</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>"; |
|
| 909 | + echo "<tr><td>"._("Anonymous outer ID (optional):")."</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>"; |
|
| 910 | + echo "<tr><td>"._("Password:")."</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>"; |
|
| 911 | 911 | } |
| 912 | 912 | // ask for cert + privkey if TLS-based method is active |
| 913 | 913 | if ($clientCertRequired) { |
| 914 | - echo "<tr><td colspan='2'><strong>" . _("Certificate-based EAP types") . "</strong></td></tr> |
|
| 915 | - <tr><td>" . _("Certificate file (.p12 or .pfx):") . "</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr> |
|
| 916 | - <tr><td>" . _("Certificate password, if any:") . "</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr> |
|
| 917 | - <tr><td>" . _("Username, if different from certificate Subject:") . "</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>"; |
|
| 914 | + echo "<tr><td colspan='2'><strong>"._("Certificate-based EAP types")."</strong></td></tr> |
|
| 915 | + <tr><td>" . _("Certificate file (.p12 or .pfx):")."</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr> |
|
| 916 | + <tr><td>" . _("Certificate password, if any:")."</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr> |
|
| 917 | + <tr><td>" . _("Username, if different from certificate Subject:")."</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>"; |
|
| 918 | 918 | } |
| 919 | - echo "<tr><td colspan='2'><button id='submit_credentials'>" . _("Submit credentials") . "</button></td></tr></table></form>"; |
|
| 919 | + echo "<tr><td colspan='2'><button id='submit_credentials'>"._("Submit credentials")."</button></td></tr></table></form>"; |
|
| 920 | 920 | echo "<div id='live_login_results' style='display:none'>"; |
| 921 | 921 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 922 | 922 | print "<hr>"; |
| 923 | - printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>"); |
|
| 924 | - print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src" . $hostindex . "_img' style='width:24px; position: absolute; $start: 20px; bottom: 0px; '></span>"; |
|
| 923 | + printf(_("Testing from: %s"), "<strong>".\config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>"); |
|
| 924 | + print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src".$hostindex."_img' style='width:24px; position: absolute; $start: 20px; bottom: 0px; '></span>"; |
|
| 925 | 925 | print "<div id='eap_test$hostindex' class='eap_test_results'></div>"; |
| 926 | 926 | } |
| 927 | 927 | echo "</div>"; |
@@ -936,9 +936,9 @@ discard block |
||
| 936 | 936 | } |
| 937 | 937 | |
| 938 | 938 | if (isset($_POST['comefrom'])) { |
| 939 | - $return = htmlspecialchars_decode($_POST['comefrom']) . ( $inst_id ? "?inst_id=" . $inst_id : "" ); |
|
| 939 | + $return = htmlspecialchars_decode($_POST['comefrom']).($inst_id ? "?inst_id=".$inst_id : ""); |
|
| 940 | 940 | echo "<form method='post' action='$return' accept-charset='UTF-8'> |
| 941 | - <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CLOSE . "'>" . sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_idp) . "</button>" |
|
| 941 | + <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CLOSE."'>".sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_idp)."</button>" |
|
| 942 | 942 | . "</form>"; |
| 943 | 943 | } |
| 944 | 944 | if ($check_realm !== FALSE) { |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | ?> |
| 29 | 29 | <?php |
| 30 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 30 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 31 | 31 | $auth = new \web\lib\admin\Authentication(); |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
| 33 | 33 | $validator = new \web\lib\common\InputValidation(); |
@@ -105,10 +105,10 @@ discard block |
||
| 105 | 105 | $fed = $validator->existingFederation($_POST['NRO-list']); |
| 106 | 106 | $country = strtoupper($fed->tld); |
| 107 | 107 | $DN[] = "C=$country"; |
| 108 | - $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]); |
|
| 108 | + $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]); |
|
| 109 | 109 | $serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld); |
| 110 | 110 | $serverList = explode(",", array_key_first($serverInfo)); |
| 111 | - $DN[] = "CN=" . $serverList[0]; |
|
| 111 | + $DN[] = "CN=".$serverList[0]; |
|
| 112 | 112 | $policies[] = "eduroam IdP"; |
| 113 | 113 | $policies[] = "eduroam SP"; |
| 114 | 114 | $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"]; |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 134 | 134 | $serverList = explode(",", $serverInfo["servers"]); |
| 135 | - $DN[] = "CN=" . $serverList[0]; |
|
| 135 | + $DN[] = "CN=".$serverList[0]; |
|
| 136 | 136 | switch ($serverInfo["type"]) { |
| 137 | 137 | case core\IdP::TYPE_IDPSP: |
| 138 | 138 | $policies[] = "eduroam IdP"; |
@@ -152,12 +152,12 @@ discard block |
||
| 152 | 152 | default: |
| 153 | 153 | throw new Exception("Sorry: Unknown level of issuance requested."); |
| 154 | 154 | } |
| 155 | - echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
|
| 155 | + echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties"); |
|
| 156 | 156 | echo "<ul>"; |
| 157 | - echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
|
| 158 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN) . "</li>"; |
|
| 159 | - echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
|
| 160 | - echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
|
| 157 | + echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>"; |
|
| 158 | + echo "<li>"._("Distinguished Name: ").implode(", ", $DN)."</li>"; |
|
| 159 | + echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>"; |
|
| 160 | + echo "<li>"._("Requester Contact Details: ").$firstName." <".$firstMail.">"."</li>"; |
|
| 161 | 161 | echo "</ul></p>"; |
| 162 | 162 | |
| 163 | 163 | $vettedCsr = $validator->string($_POST['CSR'], true); |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $loggerInstance->debug(2, $DN, "CERT DN: ", "\n"); |
| 174 | 174 | // our certs can be good for max 5 years |
| 175 | 175 | $fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays); |
| 176 | - echo "<p>" . _("The certificate was requested.") . "</p>"; |
|
| 176 | + echo "<p>"._("The certificate was requested.")."</p>"; |
|
| 177 | 177 | ?> |
| 178 | 178 | <form action="overview_certificates.php" method="GET"> |
| 179 | 179 | <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button> |
@@ -191,23 +191,23 @@ discard block |
||
| 191 | 191 | switch (count($feds)) { |
| 192 | 192 | case 0: |
| 193 | 193 | echo "<div>"; |
| 194 | - echo $uiElements->boxRemark("<strong>" . sprintf(_("None of your %s servers has complete information in the database."),$uiElements->nomenclatureFed)."</strong>" . _("At least the DNS names of TLS servers and a role-based contact mail address are required.")); |
|
| 194 | + echo $uiElements->boxRemark("<strong>".sprintf(_("None of your %s servers has complete information in the database."), $uiElements->nomenclatureFed)."</strong>"._("At least the DNS names of TLS servers and a role-based contact mail address are required.")); |
|
| 195 | 195 | echo "</div>"; |
| 196 | 196 | break; |
| 197 | 197 | case 1: |
| 198 | - echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 199 | - echo " <strong>" . $cat->knownFederations[$feds[0]->tld] . "</strong>"; |
|
| 200 | - echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>'; |
|
| 198 | + echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 199 | + echo " <strong>".$cat->knownFederations[$feds[0]->tld]."</strong>"; |
|
| 200 | + echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>'; |
|
| 201 | 201 | break; |
| 202 | 202 | default: |
| 203 | - echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 203 | + echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 204 | 204 | ?> |
| 205 | 205 | <select name="NRO-list" id="NRO-list"> |
| 206 | 206 | <option value="notset"><?php echo _("---PPPLEASE CHOOSE---"); ?></option> |
| 207 | 207 | <?php |
| 208 | 208 | foreach ($feds as $oneFed) { |
| 209 | 209 | #echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld] . "</option>"; |
| 210 | - echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>"; |
|
| 210 | + echo '<option value="AAA'.strtoupper($oneFed->tld).'">'.$oneIdP["names"][$langObject->getLang()]."</option>"; |
|
| 211 | 211 | |
| 212 | 212 | } |
| 213 | 213 | ?> |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | ?> |
| 219 | 219 | <script> |
| 220 | 220 | var instservers = []; |
| 221 | - var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo));?>'; |
|
| 221 | + var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?>'; |
|
| 222 | 222 | <?php |
| 223 | 223 | $allIdPs = []; |
| 224 | 224 | foreach ($allAuthorizedFeds as $oneFed) { |
| 225 | 225 | foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) { |
| 226 | - $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["names"][$langObject->getLang()]; |
|
| 227 | - echo "instservers['" . $id . "']='" . str_replace(",", ", ", $oneIdP["servers"]) . "';\n"; |
|
| 226 | + $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["names"][$langObject->getLang()]; |
|
| 227 | + echo "instservers['".$id."']='".str_replace(",", ", ", $oneIdP["servers"])."';\n"; |
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | ?> |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 253 | 253 | <?php |
| 254 | 254 | foreach ($allIdPs as $id => $name) { |
| 255 | - echo '<option value="' . $id . '">' . $name . "</option>"; |
|
| 255 | + echo '<option value="'.$id.'">'.$name."</option>"; |
|
| 256 | 256 | } |
| 257 | 257 | ?> |
| 258 | 258 | </select> |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | <?php |
| 262 | 262 | echo _('According to the above settings you will receive') |
| 263 | 263 | ?> |
| 264 | - <span id='certlevel'><?php echo _('NRO level certificate');?></span> |
|
| 264 | + <span id='certlevel'><?php echo _('NRO level certificate'); ?></span> |
|
| 265 | 265 | |
| 266 | 266 | </span>for server names: |
| 267 | 267 | <span id='serversinfo'><?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?></span> |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | <?php |
| 270 | 270 | } else { |
| 271 | 271 | echo "<div>"; |
| 272 | - echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")),$uiElements->nomenclatureFed), "No TLS capable org!", true); |
|
| 272 | + echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")), $uiElements->nomenclatureFed), "No TLS capable org!", true); |
|
| 273 | 273 | echo "</div>"; |
| 274 | 274 | } |
| 275 | 275 | ?> |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | <h2><?php echo _("2. CSR generation"); ?></h2> |
| 280 | 280 | <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p> |
| 281 | 281 | <?php |
| 282 | - echo "openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /". implode('/', array_reverse($DN)) ."/C=XY/O=WillBeReplaced/CN=will.be.replaced"; |
|
| 282 | + echo "openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /".implode('/', array_reverse($DN))."/C=XY/O=WillBeReplaced/CN=will.be.replaced"; |
|
| 283 | 283 | ?> |
| 284 | 284 | <h2><?php echo _("3. Submission"); ?></h2> |
| 285 | 285 | <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/> |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | <?php |
| 97 | 97 | foreach ($cat->printCountryList(1) as $country => $name) { |
| 98 | 98 | $selected = ''; |
| 99 | - if ($country == strtoupper($fed_id) ) { |
|
| 99 | + if ($country == strtoupper($fed_id)) { |
|
| 100 | 100 | $selected = 'selected'; |
| 101 | 101 | } |
| 102 | 102 | echo "<option value='$country' $selected>$name</option>\n"; |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $thefed = new \core\Federation($fedId); |
| 314 | 314 | /// nomenclature for 'federation', federation name, nomenclature for 'inst' |
| 315 | 315 | echo "<tr><td colspan='9'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>"; |
| 316 | - echo "<tr><td colspan='1'><strong>". _("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>"; |
|
| 316 | + echo "<tr><td colspan='1'><strong>"._("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>"; |
|
| 317 | 317 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='profilecheck' id='profile_ck_".$fedId."'></td>"; |
| 318 | 318 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='orcheck' id='or_ck_".$fedId."'></td>"; |
| 319 | 319 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='brokencert' id='brokencert_ck_".$fedId."'></td>"; |
@@ -426,14 +426,14 @@ discard block |
||
| 426 | 426 | <input type='hidden' name='inst' value='" |
| 427 | 427 | . $index."'>" |
| 428 | 428 | . "<span style='display:none' class='inst_name'>".$my_idp."</span>" |
| 429 | - . "<span>". $idp_instance->name."</span>" |
|
| 429 | + . "<span>".$idp_instance->name."</span>" |
|
| 430 | 430 | . " (<a href='overview_org.php?inst_id=" |
| 431 | 431 | . $idp_instance->identifier."'>" |
| 432 | 432 | . (in_array($index, $userIdps) ? _("manage") : _("view")) |
| 433 | 433 | . "</a>)" |
| 434 | - . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) |
|
| 434 | + . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>") |
|
| 435 | 435 | . implode("</li><li>", $listOfSilverbulletRealms) |
| 436 | - . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" ) |
|
| 436 | + . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>") |
|
| 437 | 437 | . "</td>"; |
| 438 | 438 | // deployment status; need to dive into profiles for this |
| 439 | 439 | // show happy eyeballs if at least one profile is configured/showtime |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $auth = new \web\lib\admin\Authentication(); |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -70,13 +70,13 @@ discard block |
||
| 70 | 70 | ?> |
| 71 | 71 | </h1> |
| 72 | 72 | <div class='infobox'> |
| 73 | - <h2><?php $tablecaption = sprintf(_("%s Properties"),$uiElements->nomenclatureFed); echo $tablecaption?></h2> |
|
| 73 | + <h2><?php $tablecaption = sprintf(_("%s Properties"), $uiElements->nomenclatureFed); echo $tablecaption?></h2> |
|
| 74 | 74 | <table> |
| 75 | - <caption><?php echo $tablecaption;?></caption> |
|
| 75 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 76 | 76 | <tr> |
| 77 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
| 78 | - <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th> |
|
| 79 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
| 77 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
| 78 | + <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th> |
|
| 79 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
| 80 | 80 | </tr> |
| 81 | 81 | <tr> |
| 82 | 82 | <td><?php echo _("Country:"); ?></td> |
@@ -87,11 +87,11 @@ discard block |
||
| 87 | 87 | </table> |
| 88 | 88 | </div> |
| 89 | 89 | <?php |
| 90 | - echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld" . "' method='post' accept-charset='UTF-8'> |
|
| 91 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 90 | + echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld"."' method='post' accept-charset='UTF-8'> |
|
| 91 | + <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 92 | 92 | ?> |
| 93 | 93 | <fieldset class="option_container"> |
| 94 | - <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></strong></legend> |
|
| 94 | + <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></strong></legend> |
|
| 95 | 95 | <?php |
| 96 | 96 | $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, \core\Options::LEVEL_FED); |
| 97 | 97 | echo $optionDisplay->prefilledOptionTable("fed", $my_fed->tld); |
@@ -101,10 +101,10 @@ discard block |
||
| 101 | 101 | <?php |
| 102 | 102 | echo "<div>"; |
| 103 | 103 | if ($editMode === 'fullaccess') { |
| 104 | - echo "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button>"; |
|
| 104 | + echo "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button>"; |
|
| 105 | 105 | $discardLabel = _("Discard changes"); |
| 106 | 106 | } else { |
| 107 | 107 | $discardLabel = _("Return"); |
| 108 | 108 | } |
| 109 | - echo "<button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php?fed_id=$fedPost\"'>" . $discardLabel . "</button></div></form>"; |
|
| 109 | + echo "<button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php?fed_id=$fedPost\"'>".$discardLabel."</button></div></form>"; |
|
| 110 | 110 | echo $deco->footer(); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) { |
| 32 | 32 | ?> |
@@ -43,14 +43,14 @@ discard block |
||
| 43 | 43 | <ul style='margin:1px'> |
| 44 | 44 | <?php |
| 45 | 45 | foreach ($completeness as $missing_attrib) { |
| 46 | - echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 46 | + echo "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 47 | 47 | } |
| 48 | 48 | ?> |
| 49 | 49 | </ul> |
| 50 | 50 | </div> |
| 51 | 51 | <?php |
| 52 | 52 | } else { |
| 53 | - echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
| 53 | + echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
| 54 | 54 | } |
| 55 | 55 | ?> |
| 56 | 56 | <br/> |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | if ($readonly === FALSE) { |
| 60 | 60 | ?> |
| 61 | 61 | <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&profile_id=<?php echo $theProfile->identifier; ?>' method='POST'> |
| 62 | - <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 62 | + <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 63 | 63 | </form> |
| 64 | 64 | <?php |
| 65 | 65 | } |
@@ -95,21 +95,21 @@ discard block |
||
| 95 | 95 | $has_overrides = TRUE; |
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 98 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>"; |
|
| 99 | 99 | $typelist = $theProfile->getEapMethodsinOrderOfPreference(); |
| 100 | 100 | $allcomplete = TRUE; |
| 101 | 101 | foreach ($typelist as $eaptype) { |
| 102 | 102 | $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
| 103 | 103 | $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype); |
| 104 | 104 | if ($completeness === true) { |
| 105 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 105 | + $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>"; |
|
| 106 | 106 | } else { |
| 107 | 107 | $buffer_eaptypediv .= " <div class='notacceptable'>"; |
| 108 | 108 | $buffer_eaptypediv .= _("Information needed!"); |
| 109 | 109 | if (is_array($completeness)) { |
| 110 | 110 | $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
| 111 | 111 | foreach ($completeness as $missing_attrib) { |
| 112 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 112 | + $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 113 | 113 | } |
| 114 | 114 | $buffer_eaptypediv .= "</ul>"; |
| 115 | 115 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | foreach ($attribs as $attrib) { |
| 122 | 122 | if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
| 123 | 123 | $justOnce = TRUE; |
| 124 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 124 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='"._("Options on EAP Method/Device level are in effect.")."'>"; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | $buffer_eaptypediv .= "<br/>"; |
@@ -148,15 +148,15 @@ discard block |
||
| 148 | 148 | switch ($certStatus) { |
| 149 | 149 | case core\AbstractProfile::CERT_STATUS_OK: |
| 150 | 150 | $iconData = $uiElements->iconData('CERT_STATUS_OK'); |
| 151 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 151 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 152 | 152 | break; |
| 153 | 153 | case core\AbstractProfile::CERT_STATUS_WARN: |
| 154 | 154 | $iconData = $uiElements->iconData('CERT_STATUS_WARN'); |
| 155 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 155 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 156 | 156 | break; |
| 157 | 157 | case core\AbstractProfile::CERT_STATUS_ERROR: |
| 158 | 158 | $iconData = $uiElements->iconData('CERT_STATUS_ERROR'); |
| 159 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 159 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 160 | 160 | break; |
| 161 | 161 | } |
| 162 | 162 | $buffer_headline .= "</div>"; |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
| 183 | 183 | $diagUrl = "../diag/"; |
| 184 | 184 | } else { |
| 185 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
| 185 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
| 186 | 186 | } |
| 187 | 187 | ?> |
| 188 | - <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 189 | - <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 188 | + <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 189 | + <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 190 | 190 | <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'> |
| 191 | 191 | <?php echo _("Check realm reachability"); ?> |
| 192 | 192 | </button> |
@@ -228,9 +228,9 @@ discard block |
||
| 228 | 228 | ?> |
| 229 | 229 | <div style='display: flex;'> |
| 230 | 230 | <?php |
| 231 | - $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution; |
|
| 232 | - $displayurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 233 | - $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 231 | + $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution; |
|
| 232 | + $displayurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 233 | + $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 234 | 234 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
| 235 | 235 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
| 236 | 236 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -242,9 +242,9 @@ discard block |
||
| 242 | 242 | if (empty($rawQr)) { |
| 243 | 243 | throw new Exception("Something went seriously wrong during QR code generation!"); |
| 244 | 244 | } |
| 245 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 245 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 246 | 246 | $size = getimagesize($uri); |
| 247 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
| 247 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
| 248 | 248 | |
| 249 | 249 | //echo "<nobr>$displayurl</nobr></a>"; |
| 250 | 250 | echo "<p>$displayurl</p></a>"; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | <h2><?php |
| 289 | 289 | switch ($deploymentObject->consortium) { |
| 290 | 290 | case "eduroam": |
| 291 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME; |
|
| 291 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME; |
|
| 292 | 292 | break; |
| 293 | 293 | case "OpenRoaming": |
| 294 | 294 | $displayname = "OpenRoaming ANP"; |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | default: |
| 297 | 297 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
| 298 | 298 | } |
| 299 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
| 299 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
| 300 | 300 | ?></h2> |
| 301 | 301 | <table> |
| 302 | 302 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -310,13 +310,13 @@ discard block |
||
| 310 | 310 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
| 311 | 311 | <?php |
| 312 | 312 | if ($deploymentObject->host1_v4 !== NULL) { |
| 313 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
| 313 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
| 314 | 314 | } |
| 315 | 315 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
| 316 | 316 | echo "<br/>"; |
| 317 | 317 | } |
| 318 | 318 | if ($deploymentObject->host1_v6 !== NULL) { |
| 319 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
| 319 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
| 320 | 320 | } |
| 321 | 321 | ?> |
| 322 | 322 | </td> |
@@ -324,9 +324,9 @@ discard block |
||
| 324 | 324 | <td><?php echo $deploymentObject->port1; ?></td> |
| 325 | 325 | <td> |
| 326 | 326 | <?php |
| 327 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 328 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 329 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>"; |
|
| 327 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 328 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 329 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>"; |
|
| 330 | 330 | ?> |
| 331 | 331 | </td> |
| 332 | 332 | </tr> |
@@ -334,22 +334,22 @@ discard block |
||
| 334 | 334 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
| 335 | 335 | <?php |
| 336 | 336 | if ($deploymentObject->host2_v4 !== NULL) { |
| 337 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
| 337 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
| 338 | 338 | } |
| 339 | 339 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
| 340 | 340 | echo "<br/>"; |
| 341 | 341 | } |
| 342 | 342 | if ($deploymentObject->host2_v6 !== NULL) { |
| 343 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
| 343 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
| 344 | 344 | } |
| 345 | 345 | ?></td> |
| 346 | 346 | <td><?php echo _("RADIUS port number: ") ?></td> |
| 347 | 347 | <td><?php echo $deploymentObject->port2; ?></td> |
| 348 | 348 | <td> |
| 349 | 349 | <?php |
| 350 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 351 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 352 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>"; |
|
| 350 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 351 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 352 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>"; |
|
| 353 | 353 | ?> |
| 354 | 354 | </td> |
| 355 | 355 | </tr> |
@@ -401,12 +401,12 @@ discard block |
||
| 401 | 401 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
| 402 | 402 | echo '<br>'; |
| 403 | 403 | if ($res['FAILURE'] == 2) { |
| 404 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
| 404 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
| 405 | 405 | } else { |
| 406 | 406 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 407 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
| 407 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
| 408 | 408 | } else { |
| 409 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
| 409 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
| 410 | 410 | } |
| 411 | 411 | } |
| 412 | 412 | } |
@@ -441,12 +441,12 @@ discard block |
||
| 441 | 441 | if ($res['FAILURE'] > 0) { |
| 442 | 442 | echo '<br>'; |
| 443 | 443 | if ($res['FAILURE'] == 2) { |
| 444 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
| 444 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
| 445 | 445 | } else { |
| 446 | 446 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 447 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
| 447 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
| 448 | 448 | } else { |
| 449 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
| 449 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | } |
@@ -467,24 +467,24 @@ discard block |
||
| 467 | 467 | </div> |
| 468 | 468 | <div style='width:20px;'></div> <!-- QR code space, reserved --> |
| 469 | 469 | <div style='display: table-cell; min-width:200px;'> |
| 470 | - <?php $tablecaption = _("Hotspot Usage Statistics");?> |
|
| 470 | + <?php $tablecaption = _("Hotspot Usage Statistics"); ?> |
|
| 471 | 471 | <h1><?php echo $tablecaption; ?></h1> |
| 472 | - <h2><?php echo _("5 most recent authentications");?></h2> |
|
| 473 | - <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p> |
|
| 472 | + <h2><?php echo _("5 most recent authentications"); ?></h2> |
|
| 473 | + <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p> |
|
| 474 | 474 | <table class='authrecord'> |
| 475 | - <caption><?php echo $tablecaption;?></caption> |
|
| 475 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 476 | 476 | <tr style='text-align: left;'> |
| 477 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
| 478 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
| 479 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
| 480 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
| 481 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
| 482 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
| 477 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
| 478 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
| 479 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
| 480 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
| 481 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
| 482 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
| 483 | 483 | </tr> |
| 484 | 484 | <?php |
| 485 | - $userAuthData = $deploymentObject->retrieveStatistics(0,5); |
|
| 485 | + $userAuthData = $deploymentObject->retrieveStatistics(0, 5); |
|
| 486 | 486 | foreach ($userAuthData as $oneRecord) { |
| 487 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
| 487 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
| 488 | 488 | . "<td>".$oneRecord['activity_time']."</td>" |
| 489 | 489 | . "<td>".$oneRecord['realm']."</td>" |
| 490 | 490 | . "<td>".$oneRecord['mac']."</td>" |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | <div> |
| 710 | 710 | <input type="hidden" name="consortium" value="eduroam"/> |
| 711 | 711 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
| 712 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 712 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 713 | 713 | </button> |
| 714 | 714 | <span style='color: red;'> |
| 715 | 715 | <?php if ($hasMail == 0) { |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | sprintf(_("%s: Do not terminate EAP"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-noterm", |
| 136 | 136 | sprintf(_("%s: max users per profile"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-maxusers", |
| 137 | 137 | sprintf(_("Mint %s with CA on creation"), $this->nomenclatureIdP) => "fed:minted_ca_file", |
| 138 | - sprintf(_("OpenRoaming: Allow %s Opt-In"),$this->nomenclatureParticipant) => "fed:openroaming", |
|
| 138 | + sprintf(_("OpenRoaming: Allow %s Opt-In"), $this->nomenclatureParticipant) => "fed:openroaming", |
|
| 139 | 139 | _("OpenRoaming: Custom NAPTR Target") => "fed:openroaming_customtarget", |
| 140 | 140 | $ssidText => "media:SSID", |
| 141 | 141 | $passpointOiText => "media:consortium_OI", |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $find = array_keys($displayNames, $input, TRUE); |
| 148 | 148 | |
| 149 | 149 | if (count($find) == 0) { // this is an error! throw an Exception |
| 150 | - throw new \Exception("The translation of an option name was requested, but the option is not known to the system: " . htmlentities($input)); |
|
| 150 | + throw new \Exception("The translation of an option name was requested, but the option is not known to the system: ".htmlentities($input)); |
|
| 151 | 151 | } |
| 152 | 152 | \core\common\Entity::outOfThePotatoes(); |
| 153 | 153 | // none of the strings have HTML in them, only translators can provide own text for it -> no threat, but complained about by the security review |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | foreach ($optionlist as $option) { |
| 171 | 171 | $type = $optioninfo->optionType($option['name']); |
| 172 | - if (preg_match('/^' . $class . '/', $option['name']) && $option['level'] == "$level") { |
|
| 172 | + if (preg_match('/^'.$class.'/', $option['name']) && $option['level'] == "$level") { |
|
| 173 | 173 | // all non-multilang attribs get this assignment ... |
| 174 | 174 | $language = ""; |
| 175 | 175 | $content = $option['value']; |
@@ -187,19 +187,19 @@ discard block |
||
| 187 | 187 | $locationMarkers[] = $coords; |
| 188 | 188 | break; |
| 189 | 189 | case "file": |
| 190 | - $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td>"; |
|
| 190 | + $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td>"; |
|
| 191 | 191 | switch ($option['name']) { |
| 192 | 192 | case "general:logo_file": |
| 193 | 193 | case "fed:logo_file": |
| 194 | - $retval .= $this->previewImageinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']); |
|
| 194 | + $retval .= $this->previewImageinHTML('ROWID-'.$option['level'].'-'.$option['row_id']); |
|
| 195 | 195 | break; |
| 196 | 196 | case "eap:ca_file": |
| 197 | 197 | // fall-through intended: display both the same way |
| 198 | 198 | case "fed:minted_ca_file": |
| 199 | - $retval .= $this->previewCAinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']); |
|
| 199 | + $retval .= $this->previewCAinHTML('ROWID-'.$option['level'].'-'.$option['row_id']); |
|
| 200 | 200 | break; |
| 201 | 201 | case "support:info_file": |
| 202 | - $retval .= $this->previewInfoFileinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']); |
|
| 202 | + $retval .= $this->previewInfoFileinHTML('ROWID-'.$option['level'].'-'.$option['row_id']); |
|
| 203 | 203 | break; |
| 204 | 204 | default: |
| 205 | 205 | } |
@@ -209,10 +209,10 @@ discard block |
||
| 209 | 209 | // do not display the option at all; it gets auto-set by the ProfileSilverbullet constructor and doesn't have to be seen |
| 210 | 210 | break; |
| 211 | 211 | } |
| 212 | - $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>"; |
|
| 212 | + $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>".($content == "on" ? _("on") : _("off"))."</strong></td></tr>"; |
|
| 213 | 213 | break; |
| 214 | 214 | default: |
| 215 | - $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>"; |
|
| 215 | + $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>$content</strong></td></tr>"; |
|
| 216 | 216 | } |
| 217 | 217 | } |
| 218 | 218 | } |
@@ -221,11 +221,11 @@ discard block |
||
| 221 | 221 | $locationCount = 0; |
| 222 | 222 | foreach ($locationMarkers as $g) { |
| 223 | 223 | $locationCount++; |
| 224 | - $marker .= '<marker name="' . $locationCount . '" lat="' . $g['lat'] . '" lng="' . $g['lon'] . '" />'; |
|
| 224 | + $marker .= '<marker name="'.$locationCount.'" lat="'.$g['lat'].'" lng="'.$g['lon'].'" />'; |
|
| 225 | 225 | } |
| 226 | 226 | $marker .= '<\/markers>'; // some validator says this should be escaped |
| 227 | 227 | $jMarker = json_encode($locationMarkers); |
| 228 | - $retval .= '<tr><td><script>markers=\'' . $marker . '\'; jmarkers = \'' . $jMarker . '\';</script></td><td></td><td></td></tr>'; |
|
| 228 | + $retval .= '<tr><td><script>markers=\''.$marker.'\'; jmarkers = \''.$jMarker.'\';</script></td><td></td><td></td></tr>'; |
|
| 229 | 229 | } |
| 230 | 230 | \core\common\Entity::outOfThePotatoes(); |
| 231 | 231 | return $retval; |
@@ -241,11 +241,11 @@ discard block |
||
| 241 | 241 | \core\common\Entity::intoThePotatoes(); |
| 242 | 242 | $idpoptions = $myInst->getAttributes(); |
| 243 | 243 | $retval = "<div class='infobox'> |
| 244 | - <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant) . "</h2> |
|
| 244 | + <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant)."</h2> |
|
| 245 | 245 | <table> |
| 246 | 246 | <tr> |
| 247 | 247 | <td> |
| 248 | - " . _("Country:") . " |
|
| 248 | + " . _("Country:")." |
|
| 249 | 249 | </td> |
| 250 | 250 | <td> |
| 251 | 251 | </td> |
@@ -255,16 +255,16 @@ discard block |
||
| 255 | 255 | $retval .= $myFed->name; |
| 256 | 256 | $retval .= "</strong> |
| 257 | 257 | </td> |
| 258 | - </tr>" . $this->infoblock($idpoptions, "general", "IdP") . " |
|
| 258 | + </tr>" . $this->infoblock($idpoptions, "general", "IdP")." |
|
| 259 | 259 | </table> |
| 260 | 260 | </div>"; |
| 261 | 261 | |
| 262 | 262 | $blocks = [["support", _("Global Helpdesk Details")], ["media", _("Media Properties")]]; |
| 263 | 263 | foreach ($blocks as $block) { |
| 264 | 264 | $retval .= "<div class='infobox'> |
| 265 | - <h2>" . $block[1] . "</h2> |
|
| 265 | + <h2>" . $block[1]."</h2> |
|
| 266 | 266 | <table>" . |
| 267 | - $this->infoblock($idpoptions, $block[0], "IdP") . |
|
| 267 | + $this->infoblock($idpoptions, $block[0], "IdP"). |
|
| 268 | 268 | "</table> |
| 269 | 269 | </div>"; |
| 270 | 270 | } |
@@ -279,12 +279,12 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | private function displaySize(int $number) { |
| 281 | 281 | if ($number > 1024 * 1024) { |
| 282 | - return round($number / 1024 / 1024, 2) . " MiB"; |
|
| 282 | + return round($number / 1024 / 1024, 2)." MiB"; |
|
| 283 | 283 | } |
| 284 | 284 | if ($number > 1024) { |
| 285 | - return round($number / 1024, 2) . " KiB"; |
|
| 285 | + return round($number / 1024, 2)." KiB"; |
|
| 286 | 286 | } |
| 287 | - return $number . " B"; |
|
| 287 | + return $number." B"; |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | /** |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | $caExpiryTrashhold = \config\ConfAssistant::CERT_WARNINGS['expiry_warning']; |
| 340 | 340 | $rawResult = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE); |
| 341 | 341 | if (is_bool($rawResult)) { // we didn't actually get a CA! |
| 342 | - $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the certificate from the database!") . "</div>"; |
|
| 342 | + $retval = "<div class='ca-summary'>"._("There was an error while retrieving the certificate from the database!")."</div>"; |
|
| 343 | 343 | \core\common\Entity::outOfThePotatoes(); |
| 344 | 344 | return $retval; |
| 345 | 345 | } |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']); |
| 357 | 357 | $details['name'] = preg_replace('/\//', "", $details['name']); |
| 358 | - $certstatus = ( $details['root'] == 1 ? "R" : "I"); |
|
| 359 | - $certTooltip = ( $details['root'] == 1 ? _("Root CA") : _("Intermediate CA")); |
|
| 358 | + $certstatus = ($details['root'] == 1 ? "R" : "I"); |
|
| 359 | + $certTooltip = ($details['root'] == 1 ? _("Root CA") : _("Intermediate CA")); |
|
| 360 | 360 | $innerbgColor = "#0000ff"; |
| 361 | 361 | $leftBorderColor = "#00ff00"; |
| 362 | 362 | $message = ""; |
@@ -364,35 +364,35 @@ discard block |
||
| 364 | 364 | $leftBorderColor = "red"; |
| 365 | 365 | $message = _("This is a <strong>SERVER</strong> certificate!"); |
| 366 | 366 | if (\config\ConfAssistant::CERT_GUIDELINES !== '') { |
| 367 | - $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>"; |
|
| 367 | + $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>"; |
|
| 368 | 368 | } |
| 369 | 369 | $message .= "<br/>"; |
| 370 | - $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . $message . $details['name'] . "</div>"; |
|
| 370 | + $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>".$message.$details['name']."</div>"; |
|
| 371 | 371 | \core\common\Entity::outOfThePotatoes(); |
| 372 | 372 | return $retval; |
| 373 | 373 | } |
| 374 | 374 | $now = time(); |
| 375 | 375 | if ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_critical'] > $details['full_details']['validTo_time_t']) { |
| 376 | 376 | $leftBorderColor = "red"; |
| 377 | - $message = _("Certificate expired!") . "<br>"; |
|
| 378 | - } elseif($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warnings'] > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) { |
|
| 377 | + $message = _("Certificate expired!")."<br>"; |
|
| 378 | + } elseif ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warnings'] > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) { |
|
| 379 | 379 | if ($leftBorderColor == "#00ff00") { |
| 380 | 380 | $leftBorderColor = "yellow"; |
| 381 | 381 | } |
| 382 | - $message = _("Certificate close to expiry!") . "<br/>"; |
|
| 382 | + $message = _("Certificate close to expiry!")."<br/>"; |
|
| 383 | 383 | } |
| 384 | 384 | |
| 385 | 385 | if ($details['root'] == 1 && $details['basicconstraints_set'] == 0) { |
| 386 | 386 | if ($leftBorderColor == "#00ff00") { |
| 387 | 387 | $leftBorderColor = "yellow"; |
| 388 | 388 | } |
| 389 | - $message .= "<div style='max-width: 25em'><strong>" . _("Improper root certificate, required critical CA extension missing, will not reliably install!") . "</strong>"; |
|
| 389 | + $message .= "<div style='max-width: 25em'><strong>"._("Improper root certificate, required critical CA extension missing, will not reliably install!")."</strong>"; |
|
| 390 | 390 | if (\config\ConfAssistant::CERT_GUIDELINES !== '') { |
| 391 | - $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>"; |
|
| 391 | + $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>"; |
|
| 392 | 392 | } |
| 393 | 393 | $message .= "</div><br/>"; |
| 394 | 394 | } |
| 395 | - $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $message . $details['name'] . "<br>" . $this->displayName('eap:ca_vailduntil') . " " . gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t']) . " UTC</div>"; |
|
| 395 | + $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>".$message.$details['name']."<br>".$this->displayName('eap:ca_vailduntil')." ".gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t'])." UTC</div>"; |
|
| 396 | 396 | \core\common\Entity::outOfThePotatoes(); |
| 397 | 397 | return $retval; |
| 398 | 398 | } |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | */ |
| 406 | 406 | public function previewImageinHTML($imageReference) { |
| 407 | 407 | \core\common\Entity::intoThePotatoes(); |
| 408 | - $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=" . $imageReference . "' alt='" . _("Preview of logo file") . "'/>"; |
|
| 408 | + $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=".$imageReference."' alt='"._("Preview of logo file")."'/>"; |
|
| 409 | 409 | \core\common\Entity::outOfThePotatoes(); |
| 410 | 410 | return $retval; |
| 411 | 411 | } |
@@ -422,13 +422,13 @@ discard block |
||
| 422 | 422 | $ref = $validator->databaseReference($fileReference); |
| 423 | 423 | $fileBlob = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE); |
| 424 | 424 | if (is_bool($fileBlob)) { // we didn't actually get a file! |
| 425 | - $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the file from the database!") . "</div>"; |
|
| 425 | + $retval = "<div class='ca-summary'>"._("There was an error while retrieving the file from the database!")."</div>"; |
|
| 426 | 426 | \core\common\Entity::outOfThePotatoes(); |
| 427 | 427 | return $retval; |
| 428 | 428 | } |
| 429 | 429 | $decodedFileBlob = base64_decode($fileBlob); |
| 430 | 430 | $fileinfo = new \finfo(); |
| 431 | - $retval = "<div class='ca-summary'>" . _("File exists") . " (" . $fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE) . ", " . $this->displaySize(strlen($decodedFileBlob)) . ")<br/><a href='inc/filepreview.php?id=$fileReference'>" . _("Preview") . "</a></div>"; |
|
| 431 | + $retval = "<div class='ca-summary'>"._("File exists")." (".$fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE).", ".$this->displaySize(strlen($decodedFileBlob)).")<br/><a href='inc/filepreview.php?id=$fileReference'>"._("Preview")."</a></div>"; |
|
| 432 | 432 | \core\common\Entity::outOfThePotatoes(); |
| 433 | 433 | return $retval; |
| 434 | 434 | } |
@@ -585,8 +585,8 @@ discard block |
||
| 585 | 585 | return ""; |
| 586 | 586 | } |
| 587 | 587 | |
| 588 | - $loggerInstance->debug(4, "Consortium logo is at: " . ROOT . "/web/resources/images/consortium_logo_large.png"); |
|
| 589 | - $logogd = imagecreatefrompng(ROOT . "/web/resources/images/consortium_logo_large.png"); |
|
| 588 | + $loggerInstance->debug(4, "Consortium logo is at: ".ROOT."/web/resources/images/consortium_logo_large.png"); |
|
| 589 | + $logogd = imagecreatefrompng(ROOT."/web/resources/images/consortium_logo_large.png"); |
|
| 590 | 590 | if ($logogd === FALSE) { // consortium logo is bogus; don't do anything |
| 591 | 591 | return ""; |
| 592 | 592 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | imagecolorallocate($whiteimage, 255, 255, 255); |
| 613 | 613 | // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected |
| 614 | 614 | $targetplacementx = (int) ($symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize + 1) / 2) / $symbolsize)); |
| 615 | - $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1 ) / 2) / $symbolsize)); |
|
| 615 | + $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1) / 2) / $symbolsize)); |
|
| 616 | 616 | imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize); |
| 617 | 617 | imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]); |
| 618 | 618 | ob_start(); |
@@ -662,9 +662,9 @@ discard block |
||
| 662 | 662 | $message = "Your configuration appears to be fine."; |
| 663 | 663 | break; |
| 664 | 664 | default: |
| 665 | - throw new Exception("The result code level " . $test->test_result['global'] . " is not defined!"); |
|
| 665 | + throw new Exception("The result code level ".$test->test_result['global']." is not defined!"); |
|
| 666 | 666 | } |
| 667 | - $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>" . $message . "<br>See below for details<br><hr>"); |
|
| 667 | + $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>"); |
|
| 668 | 668 | foreach ($test->out as $testValue) { |
| 669 | 669 | foreach ($testValue as $o) { |
| 670 | 670 | $out .= $this->boxFlexible($o['level'], $o['message']); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | private function inputValidationError($customtext) |
| 41 | 41 | { |
| 42 | 42 | \core\common\Entity::intoThePotatoes(); |
| 43 | - $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>"; |
|
| 43 | + $retval = "<p>"._("Input validation error: ").$customtext."</p>"; |
|
| 44 | 44 | \core\common\Entity::outOfThePotatoes(); |
| 45 | 45 | return $retval; |
| 46 | 46 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $postFed = $fedIdentifiers[$correctIndex]; |
| 98 | 98 | $temp = new \core\Federation($postFed); |
| 99 | 99 | if ($owner === NULL) { |
| 100 | - return [$temp,'readonly']; |
|
| 100 | + return [$temp, 'readonly']; |
|
| 101 | 101 | } |
| 102 | 102 | $user = new \core\User($owner); |
| 103 | 103 | foreach ($temp->listFederationAdmins() as $oneowner) { |
@@ -105,9 +105,9 @@ discard block |
||
| 105 | 105 | return [$temp, 'fullaccess']; |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | - if ($user->isSuperadmin()|| $user->isSupport()) { |
|
| 108 | + if ($user->isSuperadmin() || $user->isSupport()) { |
|
| 109 | 109 | $this->loggerInstance->debug(4, "You are the superadmin/support\n"); |
| 110 | - return [$temp,'readonly']; |
|
| 110 | + return [$temp, 'readonly']; |
|
| 111 | 111 | } |
| 112 | 112 | throw new Exception($this->inputValidationError(sprintf("User is not %s administrator!", \core\common\Entity::$nomenclature_fed))); |
| 113 | 113 | } |
@@ -168,18 +168,18 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | if ($user->isFederationAdmin($temp->federation)) { |
| 170 | 170 | $this->loggerInstance->debug(4, "You are fed admin for this IdP\n"); |
| 171 | - return [$temp,'readonly']; |
|
| 171 | + return [$temp, 'readonly']; |
|
| 172 | 172 | } |
| 173 | 173 | if ($user->isSuperadmin() || $user->isSupport()) { |
| 174 | 174 | $this->loggerInstance->debug(4, "You are the superadmin/support\n"); |
| 175 | - return [$temp,'readonly']; |
|
| 175 | + return [$temp, 'readonly']; |
|
| 176 | 176 | } |
| 177 | 177 | throw new Exception($this->inputValidationError("This IdP identifier is not accessible!")); |
| 178 | 178 | } |
| 179 | 179 | if ($claimedFedBinding !== NULL && strtoupper($temp->federation) != strtoupper($claimedFedBinding->tld)) { |
| 180 | 180 | throw new Exception($this->inputValidationError("This IdP does not belong to the claimed federation!")); |
| 181 | 181 | } |
| 182 | - return [$temp,'nouser']; |
|
| 182 | + return [$temp, 'nouser']; |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | /** |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | try { |
| 622 | 622 | $image->readImageBlob($binary); |
| 623 | 623 | } catch (\ImagickException $exception) { |
| 624 | - echo "Error" . $exception->getMessage(); |
|
| 624 | + echo "Error".$exception->getMessage(); |
|
| 625 | 625 | return FALSE; |
| 626 | 626 | } |
| 627 | 627 | // image survived the sanity check |
