GEANT /
CAT
@@ -168,27 +168,27 @@ discard block |
||
| 168 | 168 | { |
| 169 | 169 | // it could match CN or sAN:DNS, we don't care which |
| 170 | 170 | if (isset($this->TLS_CA_checks_result[$host]['certdata']['subject'])) { |
| 171 | - $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . |
|
| 172 | - " against Subject: " . $this->TLS_CA_checks_result[$host]['certdata']['subject']); |
|
| 171 | + $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName. |
|
| 172 | + " against Subject: ".$this->TLS_CA_checks_result[$host]['certdata']['subject']); |
|
| 173 | 173 | // we are checking against accidental misconfig, not attacks, so loosely checking against end of string is appropriate |
| 174 | - if (preg_match("/CN=" . $this->expectedName . "/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) { |
|
| 174 | + if (preg_match("/CN=".$this->expectedName."/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) { |
|
| 175 | 175 | return TRUE; |
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | if (isset($this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'])) { |
| 179 | - $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . " against sANs: "); |
|
| 179 | + $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName." against sANs: "); |
|
| 180 | 180 | $this->loggerInstance->debug(4, $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname']); |
| 181 | 181 | $testNames = $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname']; |
| 182 | 182 | if (!is_array($testNames)) { |
| 183 | 183 | $testNames = [$testNames]; |
| 184 | 184 | } |
| 185 | 185 | foreach ($testNames as $oneName) { |
| 186 | - if (preg_match("/" . $this->expectedName . "/", $oneName) === 1) { |
|
| 186 | + if (preg_match("/".$this->expectedName."/", $oneName) === 1) { |
|
| 187 | 187 | return TRUE; |
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | - $this->loggerInstance->debug(3, "Tried to check expected server name " . $this->expectedName . " but neither CN nor sANs matched."); |
|
| 191 | + $this->loggerInstance->debug(3, "Tried to check expected server name ".$this->expectedName." but neither CN nor sANs matched."); |
|
| 192 | 192 | |
| 193 | 193 | $this->TLS_CA_checks_result[$host]['cert_oddity'] = RADIUSTests::CERTPROB_DYN_SERVER_NAME_MISMATCH; |
| 194 | 194 | return FALSE; |
@@ -218,9 +218,9 @@ discard block |
||
| 218 | 218 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['status'] = $cert['status']; |
| 219 | 219 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['message'] = $this->TLS_certkeys[$cert['status']]; |
| 220 | 220 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['expected'] = $cert['expected']; |
| 221 | - $add = ' -cert ' . ROOT . '/config/cli-certs/' . $cert['public'] . ' -key ' . ROOT . '/config/cli-certs/' . $cert['private']; |
|
| 222 | - if (!file_exists(ROOT . '/config/cli-certs/' . $cert['public']) ||!file_exists(ROOT . |
|
| 223 | - '/config/cli-certs/' . $cert['private'])) { |
|
| 221 | + $add = ' -cert '.ROOT.'/config/cli-certs/'.$cert['public'].' -key '.ROOT.'/config/cli-certs/'.$cert['private']; |
|
| 222 | + if (!file_exists(ROOT.'/config/cli-certs/'.$cert['public']) || !file_exists(ROOT. |
|
| 223 | + '/config/cli-certs/'.$cert['private'])) { |
|
| 224 | 224 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['finalerror'] = 2; |
| 225 | 225 | continue; |
| 226 | 226 | } |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = []; |
| 229 | 229 | } |
| 230 | 230 | // tls1_3 connections have a problem in strdout/stderr buffering |
| 231 | - $add .= ' ' . "-no_ssl3 -no_tls1_3"; |
|
| 231 | + $add .= ' '."-no_ssl3 -no_tls1_3"; |
|
| 232 | 232 | $opensslbabble = $this->execOpensslClient($host, $add, $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]); |
| 233 | 233 | $res = $this->opensslClientsResult($host, $opensslbabble, $this->TLS_clients_checks_result, $type, $k); |
| 234 | 234 | if ($cert['expected'] == 'PASS') { |
@@ -270,11 +270,11 @@ discard block |
||
| 270 | 270 | // but code analysers want this more explicit, so here is this extra |
| 271 | 271 | // call to escapeshellarg() |
| 272 | 272 | $escapedHost = escapeshellarg($host); |
| 273 | - $this->loggerInstance->debug(4, \config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1\n"); |
|
| 273 | + $this->loggerInstance->debug(4, \config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1\n"); |
|
| 274 | 274 | $time_start = microtime(true); |
| 275 | 275 | $opensslbabble = []; |
| 276 | 276 | $result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures |
| 277 | - exec(\config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result); |
|
| 277 | + exec(\config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result); |
|
| 278 | 278 | $time_stop = microtime(true); |
| 279 | 279 | $testresults['time_millisec'] = floor(($time_stop - $time_start) * 1000); |
| 280 | 280 | $testresults['returncode'] = $result; |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | private function propertyCheckPolicy($cert) |
| 397 | 397 | { |
| 398 | 398 | $oids = []; |
| 399 | - if (isset($cert['extensions']['certificatePolicies']) && $cert['extensions']['certificatePolicies']) { |
|
| 399 | + if (isset($cert['extensions']['certificatePolicies']) && $cert['extensions']['certificatePolicies']) { |
|
| 400 | 400 | foreach (\config\Diagnostics::RADIUSTESTS['TLS-acceptableOIDs'] as $key => $oid) { |
| 401 | 401 | if (preg_match("/Policy: $oid/", $cert['extensions']['certificatePolicies'])) { |
| 402 | 402 | $oids[$key] = $oid; |
@@ -125,6 +125,6 @@ |
||
| 125 | 125 | ]; |
| 126 | 126 | const TIMEOUTS = [ |
| 127 | 127 | 'ajax_radius_tests' => 15000, // miliseconds |
| 128 | - 'crl_download' => 10, // seconds |
|
| 128 | + 'crl_download' => 10, // seconds |
|
| 129 | 129 | ]; |
| 130 | 130 | } |
@@ -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!"); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | var listofcas = "<?php echo _("You should update your list of accredited CAs") ?>"; |
| 123 | 123 | var getitfrom = "<?php echo _("Get it from here.") ?>"; |
| 124 | 124 | var listsource = "<?php echo \config\Diagnostics::RADIUSTESTS['accreditedCAsURL'] ?>"; |
| 125 | - var moretext = "<?php echo _("more") . "»" ?>"; |
|
| 125 | + var moretext = "<?php echo _("more")."»" ?>"; |
|
| 126 | 126 | var lesstext = "<?php echo "«" ?>"; |
| 127 | 127 | var morealltext = "<?php echo _("Show detailed information for all tests") ?>"; |
| 128 | 128 | var eof_error = "<?php echo \core\diag\RADIUSTests::CERTPROB_UNEXPECTED_EOF ?>"; |
@@ -273,10 +273,10 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | cliinfo = cliinfo + '<li>'; |
| 275 | 275 | if (data.ca[key].certificate[c].finalerror && data.ca[key].certificate[c].finalerror==2) { |
| 276 | - cliinfo = cliinfo + ' <?php echo _("this test was skipped - no appropriate client certificate");?>' + '</ul></li>'; |
|
| 276 | + cliinfo = cliinfo + ' <?php echo _("this test was skipped - no appropriate client certificate"); ?>' + '</ul></li>'; |
|
| 277 | 277 | } else { |
| 278 | 278 | cliinfo = cliinfo + '<table><tbody><tr><td class="icon_td"><img class="icon" src="' + icons[level] + '" style="width: 24px;"></td><td>' + state; |
| 279 | - cliinfo = cliinfo + ' <?php echo "(" . sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+' ") . ")"; ?>' + add + '</td></tr>'; |
|
| 279 | + cliinfo = cliinfo + ' <?php echo "(".sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+' ").")"; ?>' + add + '</td></tr>'; |
|
| 280 | 280 | cliinfo = cliinfo + '</tbody></table></ul></li>'; |
| 281 | 281 | } |
| 282 | 282 | |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | }); |
| 476 | 476 | } |
| 477 | 477 | o = o + cert_data + '</table>'; |
| 478 | - $("#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>'); |
|
| 478 | + $("#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>'); |
|
| 479 | 479 | }); |
| 480 | 480 | } |
| 481 | 481 | |
@@ -486,8 +486,8 @@ discard block |
||
| 486 | 486 | <?php |
| 487 | 487 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 488 | 488 | print " |
| 489 | -$(\"#live_src" . $hostindex . "_img\").attr('src',icon_loading); |
|
| 490 | -$(\"#live_src" . $hostindex . "_img\").show(); |
|
| 489 | +$(\"#live_src" . $hostindex."_img\").attr('src',icon_loading); |
|
| 490 | +$(\"#live_src" . $hostindex."_img\").show(); |
|
| 491 | 491 | $.ajax({ |
| 492 | 492 | url: 'radius_tests.php?src=0&hostindex=$hostindex&realm='+realm, |
| 493 | 493 | type: 'POST', |
@@ -520,15 +520,15 @@ discard block |
||
| 520 | 520 | <?php |
| 521 | 521 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 522 | 522 | if ($testedProfile !== NULL) { |
| 523 | - $extraarg = "profile_id: " . $testedProfile->identifier . ", "; |
|
| 523 | + $extraarg = "profile_id: ".$testedProfile->identifier.", "; |
|
| 524 | 524 | } else { |
| 525 | 525 | $extraarg = ""; |
| 526 | 526 | } |
| 527 | 527 | print " |
| 528 | -$(\"#src" . $hostindex . "_img\").attr('src',icon_loading); |
|
| 528 | +$(\"#src" . $hostindex."_img\").attr('src',icon_loading); |
|
| 529 | 529 | $(\"#src$hostindex\").html(''); |
| 530 | 530 | running_ajax_stat++; |
| 531 | -$.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex'}, hostindex: '$hostindex', error: error_handler, success: udp, dataType: 'json'}); |
|
| 531 | +$.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex'}, hostindex: '$hostindex', error: error_handler, success: udp, dataType: 'json'}); |
|
| 532 | 532 | "; |
| 533 | 533 | } |
| 534 | 534 | |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | if ($check_realm === FALSE) { |
| 587 | 587 | print "<p>$error_message</p>"; |
| 588 | 588 | } else { |
| 589 | - print "<h1>" . sprintf(_("Realm testing for: %s"), $check_realm) . "</h1>\n"; |
|
| 589 | + print "<h1>".sprintf(_("Realm testing for: %s"), $check_realm)."</h1>\n"; |
|
| 590 | 590 | ?> |
| 591 | 591 | <div id="debug_out" style="display: none"></div> |
| 592 | 592 | <div id="tabs" style="min-width: 600px; max-width:1000px"> |
@@ -608,25 +608,25 @@ discard block |
||
| 608 | 608 | // NAPTR existence check |
| 609 | 609 | if ($dynType == "") { |
| 610 | 610 | $rfc7585suite = $dnsChecks; |
| 611 | - echo "<strong>" . _("DNS checks") . "</strong><div>"; |
|
| 611 | + echo "<strong>"._("DNS checks")."</strong><div>"; |
|
| 612 | 612 | } else { |
| 613 | 613 | if (count($orrealm) == 0) { |
| 614 | 614 | continue; |
| 615 | 615 | } |
| 616 | 616 | $rfc7585suite = $dnsChecksOR; |
| 617 | - echo "<strong>" . _("OpenRoaming DNS checks") . "</strong><div>"; |
|
| 617 | + echo "<strong>"._("OpenRoaming DNS checks")."</strong><div>"; |
|
| 618 | 618 | } |
| 619 | 619 | $naptr = $rfc7585suite->relevantNAPTR(); |
| 620 | 620 | if ($naptr == \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) { |
| 621 | 621 | if ($dynType == "") { |
| 622 | - echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>"; |
|
| 622 | + echo "<tr><td>"._("Dynamic discovery test is not configured")."</td><td>"; |
|
| 623 | 623 | } else { |
| 624 | - echo "<tr><td>" . _("OpenRoaming connectivity test is not configured") . "</td><td>"; |
|
| 624 | + echo "<tr><td>"._("OpenRoaming connectivity test is not configured")."</td><td>"; |
|
| 625 | 625 | } |
| 626 | 626 | } else { |
| 627 | 627 | echo "<table>"; |
| 628 | 628 | // output in friendly words |
| 629 | - echo "<tr><td>" . _("Checking NAPTR existence:") . "</td><td>"; |
|
| 629 | + echo "<tr><td>"._("Checking NAPTR existence:")."</td><td>"; |
|
| 630 | 630 | switch ($naptr) { |
| 631 | 631 | case \core\diag\RFC7585Tests::RETVAL_NONAPTR: |
| 632 | 632 | echo _("This realm has no NAPTR records."); |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | |
| 642 | 642 | // compliance checks for NAPTRs |
| 643 | 643 | if ($naptr > 0) { |
| 644 | - echo "<tr><td>" . _("Checking NAPTR compliance (flag = S and regex = {empty}):") . "</td><td>"; |
|
| 644 | + echo "<tr><td>"._("Checking NAPTR compliance (flag = S and regex = {empty}):")."</td><td>"; |
|
| 645 | 645 | $naptr_valid = $rfc7585suite->relevantNAPTRcompliance(); |
| 646 | 646 | switch ($naptr_valid) { |
| 647 | 647 | case \core\diag\RADIUSTests::RETVAL_OK: |
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | // SRV resolution |
| 657 | 657 | if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK) { |
| 658 | 658 | $srv = $rfc7585suite->relevantNAPTRsrvResolution(); |
| 659 | - echo "<tr><td>" . _("Checking SRVs:") . "</td><td>"; |
|
| 659 | + echo "<tr><td>"._("Checking SRVs:")."</td><td>"; |
|
| 660 | 660 | switch ($srv) { |
| 661 | 661 | case \core\diag\RADIUSTests::RETVAL_SKIPPED: |
| 662 | 662 | echo _("This check was skipped."); |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | // IP addresses for the hosts |
| 673 | 673 | if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK && $srv > 0) { |
| 674 | 674 | $hosts = $rfc7585suite->relevantNAPTRhostnameResolution(); |
| 675 | - echo "<tr><td>" . _("Checking IP address resolution:") . "</td><td>"; |
|
| 675 | + echo "<tr><td>"._("Checking IP address resolution:")."</td><td>"; |
|
| 676 | 676 | switch ($srv) { |
| 677 | 677 | case \core\diag\RADIUSTests::RETVAL_SKIPPED: |
| 678 | 678 | echo _("This check was skipped."); |
@@ -689,12 +689,12 @@ discard block |
||
| 689 | 689 | echo "</table><br/>"; |
| 690 | 690 | if ($dynType == "") { |
| 691 | 691 | if (count($testsuite->listerrors()) == 0) { |
| 692 | - echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("with no DNS errors encountered. Congratulations!"); |
|
| 692 | + echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("with no DNS errors encountered. Congratulations!"); |
|
| 693 | 693 | } else { |
| 694 | - 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."); |
|
| 694 | + 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."); |
|
| 695 | 695 | echo "<div class='notacceptable'><table>"; |
| 696 | 696 | foreach ($testsuite->listerrors() as $details) { |
| 697 | - echo "<tr><td>" . $details['TYPE'] . "</td><td>" . $details['TARGET'] . "</td></tr>"; |
|
| 697 | + echo "<tr><td>".$details['TYPE']."</td><td>".$details['TARGET']."</td></tr>"; |
|
| 698 | 698 | } |
| 699 | 699 | echo "</table></div>"; |
| 700 | 700 | } |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | $("#dynamic_tests").show(); |
| 714 | 714 | '; |
| 715 | 715 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 716 | - $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port']; |
|
| 716 | + $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port']; |
|
| 717 | 717 | $expectedName = $addr['hostname']; |
| 718 | 718 | $ssltest = 1; |
| 719 | 719 | if (isset($addr['unavailable']) && $addr['unavailable']) { |
@@ -722,9 +722,9 @@ discard block |
||
| 722 | 722 | //$rfc6614suite = new \core\diag\RFC6614Tests([$host], $expectedName, $consortiumName); |
| 723 | 723 | print " |
| 724 | 724 | running_ajax_dyn++; |
| 725 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'capath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: capath, dataType: 'json'}); |
|
| 725 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'capath', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: capath, dataType: 'json'}); |
|
| 726 | 726 | running_ajax_dyn++; |
| 727 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'clients', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: clients, dataType: 'json'}); |
|
| 727 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'clients', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: clients, dataType: 'json'}); |
|
| 728 | 728 | "; |
| 729 | 729 | } |
| 730 | 730 | echo "} |
@@ -740,11 +740,11 @@ discard block |
||
| 740 | 740 | $("#openroaming_tests").show(); |
| 741 | 741 | '; |
| 742 | 742 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 743 | - $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port']; |
|
| 743 | + $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port']; |
|
| 744 | 744 | $expectedName = $addr['hostname']; |
| 745 | 745 | print " |
| 746 | 746 | running_ajax_openroaming++; |
| 747 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'openroamingcapath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest, protocols: '$protstr' }, hostindex: '$hostindex', openroaming: true, error: error_handler, success: capath, dataType: 'json'}); |
|
| 747 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'openroamingcapath', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest, protocols: '$protstr' }, hostindex: '$hostindex', openroaming: true, error: error_handler, success: capath, dataType: 'json'}); |
|
| 748 | 748 | "; |
| 749 | 749 | } |
| 750 | 750 | echo "} |
@@ -757,18 +757,18 @@ discard block |
||
| 757 | 757 | $naptrs[1] = $naptr; |
| 758 | 758 | } |
| 759 | 759 | } |
| 760 | - echo "<strong>" . _("Static connectivity tests") . "</strong> |
|
| 760 | + echo "<strong>"._("Static connectivity tests")."</strong> |
|
| 761 | 761 | <table><tr> |
| 762 | 762 | <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> |
| 763 | 763 | </tr></table>"; |
| 764 | 764 | if ($naptrs[0] > 0) { |
| 765 | - echo "<hr><strong>" . _("Dynamic connectivity tests") . "</strong> |
|
| 765 | + echo "<hr><strong>"._("Dynamic connectivity tests")."</strong> |
|
| 766 | 766 | <table><tr> |
| 767 | 767 | <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> |
| 768 | 768 | </tr></table>"; |
| 769 | 769 | } |
| 770 | 770 | if (isset($orrealm) && count($orrealm) && ($naptrs[1] > 0)) { |
| 771 | - echo "<hr><strong>" . _("OpenRoaming connectivity tests") . "</strong> |
|
| 771 | + echo "<hr><strong>"._("OpenRoaming connectivity tests")."</strong> |
|
| 772 | 772 | <table><tr> |
| 773 | 773 | <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> |
| 774 | 774 | </tr></table>"; |
@@ -788,12 +788,12 @@ discard block |
||
| 788 | 788 | print "<p>"; |
| 789 | 789 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 790 | 790 | print "<hr>"; |
| 791 | - printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>"); |
|
| 791 | + printf(_("Testing from: %s"), "<strong>".\config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>"); |
|
| 792 | 792 | print "<table id='results$hostindex' style='width:100%' class='udp_results'> |
| 793 | 793 | <tr> |
| 794 | -<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src" . $hostindex . "_img'></td> |
|
| 794 | +<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src".$hostindex."_img'></td> |
|
| 795 | 795 | <td id='src$hostindex' colspan=2> |
| 796 | -" . _("testing...") . " |
|
| 796 | +"._("testing...")." |
|
| 797 | 797 | </td> |
| 798 | 798 | </tr> |
| 799 | 799 | </table>"; |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | |
| 805 | 805 | </div> |
| 806 | 806 | <?php |
| 807 | - for ($i=3; $i<5; $i++) { |
|
| 807 | + for ($i = 3; $i < 5; $i++) { |
|
| 808 | 808 | if ($i == 3 && $naptrs[0] <= 0) { |
| 809 | 809 | continue; |
| 810 | 810 | } |
@@ -819,15 +819,15 @@ discard block |
||
| 819 | 819 | $rfc7585suite = $dnsChecksOR; |
| 820 | 820 | } |
| 821 | 821 | ?> |
| 822 | - <div id="tabs-<?php echo $i;?>"> |
|
| 823 | - <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> |
|
| 822 | + <div id="tabs-<?php echo $i; ?>"> |
|
| 823 | + <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> |
|
| 824 | 824 | |
| 825 | 825 | <?php |
| 826 | 826 | echo "<div id='"; |
| 827 | - if ($i==3) { echo 'dynamic'; } else { echo 'openroaming'; } |
|
| 827 | + if ($i == 3) { echo 'dynamic'; } else { echo 'openroaming'; } |
|
| 828 | 828 | echo "_tests'><fieldset class='option_container'> |
| 829 | 829 | <legend><strong>"; |
| 830 | - if ($i==3) { |
|
| 830 | + if ($i == 3) { |
|
| 831 | 831 | echo _("DYNAMIC connectivity tests"); |
| 832 | 832 | } else { |
| 833 | 833 | echo _("OpenRoaming connectivity tests"); |
@@ -841,11 +841,11 @@ discard block |
||
| 841 | 841 | } |
| 842 | 842 | $resultstoprint = []; |
| 843 | 843 | if (count($rfc7585suite->NAPTR_hostname_records) > 0) { |
| 844 | - $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>'; |
|
| 845 | - $resultstoprint[] = '<div style="align:'.$end.';"><a href="" class="moreall">' . _('Show detailed information for all tests') . '</a></div>' . '<p><strong>' . _("Checking server handshake...") . "</strong><p>"; |
|
| 844 | + $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>'; |
|
| 845 | + $resultstoprint[] = '<div style="align:'.$end.';"><a href="" class="moreall">'._('Show detailed information for all tests').'</a></div>'.'<p><strong>'._("Checking server handshake...")."</strong><p>"; |
|
| 846 | 846 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 847 | - $bracketaddr = ($addr["family"] == "IPv6" ? "[" . $addr["IP"] . "]" : $addr["IP"]); |
|
| 848 | - $resultstoprint[] = '<p><strong>' . $bracketaddr . ' TCP/' . $addr['port'] . '</strong> (' . $addr['hostname'] . ')'; |
|
| 847 | + $bracketaddr = ($addr["family"] == "IPv6" ? "[".$addr["IP"]."]" : $addr["IP"]); |
|
| 848 | + $resultstoprint[] = '<p><strong>'.$bracketaddr.' TCP/'.$addr['port'].'</strong> ('.$addr['hostname'].')'; |
|
| 849 | 849 | $prots = []; |
| 850 | 850 | if (isset($addr['protocols'])) { |
| 851 | 851 | foreach ($addr['protocols'] as $protocol) { |
@@ -855,18 +855,18 @@ discard block |
||
| 855 | 855 | } |
| 856 | 856 | } |
| 857 | 857 | if (!empty($prots)) { |
| 858 | - $resultstoprint[] = ' ' . _("supported TLS protocols: "); |
|
| 858 | + $resultstoprint[] = ' '._("supported TLS protocols: "); |
|
| 859 | 859 | $resultstoprint[] = implode(', ', $prots); |
| 860 | 860 | if (!isset($addr['istls13']) || !$addr['istls13']) { |
| 861 | - $resultstoprint[] = ' ' . '<font color="red">' . _("not supported: ") . 'TLS1.3</font>'; |
|
| 861 | + $resultstoprint[] = ' '.'<font color="red">'._("not supported: ").'TLS1.3</font>'; |
|
| 862 | 862 | } |
| 863 | 863 | } |
| 864 | 864 | $resultstoprint[] = '<ul style="list-style-type: none;" class="caresult"><li>'; |
| 865 | - $resultstoprint[] = "<table id='" . $prefix2 . "caresults$hostindex' style='width:100%'> |
|
| 865 | + $resultstoprint[] = "<table id='".$prefix2."caresults$hostindex' style='width:100%'> |
|
| 866 | 866 | <tr> |
| 867 | -<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='" . $prefix2 . "srcca$hostindex" . "_img'></td> |
|
| 868 | -<td id='" . $prefix2 . "srcca$hostindex'> |
|
| 869 | -" . _("testing...") . " |
|
| 867 | +<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='".$prefix2."srcca$hostindex"."_img'></td> |
|
| 868 | +<td id='" . $prefix2."srcca$hostindex'> |
|
| 869 | +"._("testing...")." |
|
| 870 | 870 | </td> |
| 871 | 871 | </tr> |
| 872 | 872 | </table>"; |
@@ -874,26 +874,26 @@ discard block |
||
| 874 | 874 | } |
| 875 | 875 | $clientstest = []; |
| 876 | 876 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 877 | - $clientstest[] = '<p><strong>' . $addr['IP'] . ' TCP/' . $addr['port'] . '</strong></p><ol>'; |
|
| 878 | - $clientstest[] = "<span id='" . $prefix2 . "clientresults$hostindex'><table style='width:100%'> |
|
| 877 | + $clientstest[] = '<p><strong>'.$addr['IP'].' TCP/'.$addr['port'].'</strong></p><ol>'; |
|
| 878 | + $clientstest[] = "<span id='".$prefix2."clientresults$hostindex'><table style='width:100%'> |
|
| 879 | 879 | <tr> |
| 880 | 880 | <td class='icon_td'>"; |
| 881 | - if ($i == 4 ) { |
|
| 881 | + if ($i == 4) { |
|
| 882 | 882 | $clientstest[] = "<!--"; |
| 883 | 883 | } |
| 884 | - $clientstest[] = "<img src='../resources/images/icons/loading51.gif' id='" . $prefix2 . "srcclient$hostindex" . "_img'></td> |
|
| 885 | -<td id='" . $prefix2 . "srcclient$hostindex'> |
|
| 886 | -" . _("testing..."); |
|
| 884 | + $clientstest[] = "<img src='../resources/images/icons/loading51.gif' id='".$prefix2."srcclient$hostindex"."_img'></td> |
|
| 885 | +<td id='" . $prefix2."srcclient$hostindex'> |
|
| 886 | +"._("testing..."); |
|
| 887 | 887 | |
| 888 | - if ($i == 4 ) { |
|
| 889 | - $clientstest[] = "-->" . _("not implemented yet"); |
|
| 888 | + if ($i == 4) { |
|
| 889 | + $clientstest[] = "-->"._("not implemented yet"); |
|
| 890 | 890 | } |
| 891 | 891 | $clientstest[] = "</td></tr></table></span>"; |
| 892 | 892 | $clientstest[] = '</ol>'; |
| 893 | 893 | } |
| 894 | 894 | echo '<div style="align:'.$end.';">'; |
| 895 | 895 | echo join('', $resultstoprint); |
| 896 | - 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>'; |
|
| 896 | + 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>'; |
|
| 897 | 897 | print join('', $clientstest); |
| 898 | 898 | echo '</span>'; |
| 899 | 899 | echo '</div>'; |
@@ -907,7 +907,7 @@ discard block |
||
| 907 | 907 | // check if truncates/dies on Operator-Name |
| 908 | 908 | if ($my_profile !== NULL) { |
| 909 | 909 | echo "<div id='tabs-n'><fieldset class='option_container'> |
| 910 | - <legend><strong>" . _("Live login test") . "</strong></legend>"; |
|
| 910 | + <legend><strong>" . _("Live login test")."</strong></legend>"; |
|
| 911 | 911 | $prof_compl = $my_profile->getEapMethodsinOrderOfPreference(1); |
| 912 | 912 | if (count($prof_compl) > 0) { |
| 913 | 913 | $passwordReqired = FALSE; |
@@ -920,34 +920,34 @@ discard block |
||
| 920 | 920 | $clientCertRequired = TRUE; |
| 921 | 921 | } |
| 922 | 922 | } |
| 923 | - 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> |
|
| 924 | - <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> |
|
| 925 | - <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> |
|
| 923 | + 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> |
|
| 924 | + <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> |
|
| 925 | + <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> |
|
| 926 | 926 | <form enctype='multipart/form-data' id='live_form' accept-charset='UTF-8'> |
| 927 | 927 | <input type='hidden' name='test_type' value='udp_login'> |
| 928 | - <input type='hidden' name='lang' value='" . $gui->languageInstance->getLang() . "'> |
|
| 929 | - <input type='hidden' name='profile_id' value='" . $my_profile->identifier . "'> |
|
| 928 | + <input type='hidden' name='lang' value='" . $gui->languageInstance->getLang()."'> |
|
| 929 | + <input type='hidden' name='profile_id' value='" . $my_profile->identifier."'> |
|
| 930 | 930 | <table id='live_tests'>"; |
| 931 | 931 | // if any password based EAP methods are available enable this section |
| 932 | 932 | if ($passwordReqired) { |
| 933 | - echo "<tr><td colspan='2'><strong>" . _("Password-based EAP types") . "</strong></td></tr> |
|
| 934 | - <tr><td>" . _("Real (inner) username:") . "</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>"; |
|
| 935 | - echo "<tr><td>" . _("Anonymous outer ID (optional):") . "</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>"; |
|
| 936 | - echo "<tr><td>" . _("Password:") . "</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>"; |
|
| 933 | + echo "<tr><td colspan='2'><strong>"._("Password-based EAP types")."</strong></td></tr> |
|
| 934 | + <tr><td>" . _("Real (inner) username:")."</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>"; |
|
| 935 | + echo "<tr><td>"._("Anonymous outer ID (optional):")."</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>"; |
|
| 936 | + echo "<tr><td>"._("Password:")."</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>"; |
|
| 937 | 937 | } |
| 938 | 938 | // ask for cert + privkey if TLS-based method is active |
| 939 | 939 | if ($clientCertRequired) { |
| 940 | - echo "<tr><td colspan='2'><strong>" . _("Certificate-based EAP types") . "</strong></td></tr> |
|
| 941 | - <tr><td>" . _("Certificate file (.p12 or .pfx):") . "</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr> |
|
| 942 | - <tr><td>" . _("Certificate password, if any:") . "</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr> |
|
| 943 | - <tr><td>" . _("Username, if different from certificate Subject:") . "</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>"; |
|
| 940 | + echo "<tr><td colspan='2'><strong>"._("Certificate-based EAP types")."</strong></td></tr> |
|
| 941 | + <tr><td>" . _("Certificate file (.p12 or .pfx):")."</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr> |
|
| 942 | + <tr><td>" . _("Certificate password, if any:")."</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr> |
|
| 943 | + <tr><td>" . _("Username, if different from certificate Subject:")."</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>"; |
|
| 944 | 944 | } |
| 945 | - echo "<tr><td colspan='2'><button id='submit_credentials'>" . _("Submit credentials") . "</button></td></tr></table></form>"; |
|
| 945 | + echo "<tr><td colspan='2'><button id='submit_credentials'>"._("Submit credentials")."</button></td></tr></table></form>"; |
|
| 946 | 946 | echo "<div id='live_login_results' style='display:none'>"; |
| 947 | 947 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 948 | 948 | print "<hr>"; |
| 949 | - printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>"); |
|
| 950 | - 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>"; |
|
| 949 | + printf(_("Testing from: %s"), "<strong>".\config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>"); |
|
| 950 | + 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>"; |
|
| 951 | 951 | print "<div id='eap_test$hostindex' class='eap_test_results'></div>"; |
| 952 | 952 | } |
| 953 | 953 | echo "</div>"; |
@@ -962,9 +962,9 @@ discard block |
||
| 962 | 962 | } |
| 963 | 963 | |
| 964 | 964 | if (isset($_POST['comefrom'])) { |
| 965 | - $return = htmlspecialchars_decode($_POST['comefrom']) . ( $inst_id ? "?inst_id=" . $inst_id : "" ); |
|
| 965 | + $return = htmlspecialchars_decode($_POST['comefrom']).($inst_id ? "?inst_id=".$inst_id : ""); |
|
| 966 | 966 | echo "<form method='post' action='$return' accept-charset='UTF-8'> |
| 967 | - <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CLOSE . "'>" . sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_idp) . "</button>" |
|
| 967 | + <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CLOSE."'>".sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_idp)."</button>" |
|
| 968 | 968 | . "</form>"; |
| 969 | 969 | } |
| 970 | 970 | if ($check_realm !== FALSE) { |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | 'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE, 'rtl' => FALSE], |
| 175 | 175 | 'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE, 'rtl' => FALSE], |
| 176 | 176 | 'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE, 'rtl' => FALSE], |
| 177 | - 'cy' => ['display' => 'Cymraeg', 'locale' => 'cy_GB.utf8', 'latin_based' => TRUE, 'rtl' => FALSE], |
|
| 177 | + 'cy' => ['display' => 'Cymraeg', 'locale' => 'cy_GB.utf8', 'latin_based' => TRUE, 'rtl' => FALSE], |
|
| 178 | 178 | 'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE, 'rtl' => FALSE], |
| 179 | 179 | 'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE, 'rtl' => FALSE], |
| 180 | 180 | 'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE, 'rtl' => FALSE], |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | 'db' => 'cat', |
| 222 | 222 | 'user' => 'kitty', |
| 223 | 223 | 'pass' => 'somepass', |
| 224 | - 'readonly' => FALSE,], |
|
| 224 | + 'readonly' => FALSE, ], |
|
| 225 | 225 | // this DB stores diagnostics data. The connection details can be |
| 226 | 226 | // identical to INST as there is no table overlap |
| 227 | 227 | 'DIAGNOSTICS' => [ |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | 'db' => 'cat', |
| 230 | 230 | 'user' => 'kitty', |
| 231 | 231 | 'pass' => 'somepass', |
| 232 | - 'readonly' => FALSE,], |
|
| 232 | + 'readonly' => FALSE, ], |
|
| 233 | 233 | // this slice of DB user is about the downloads table. The corresponding |
| 234 | 234 | // DB user should have write access to update statistics and the cache |
| 235 | 235 | // locations of installers. |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | 'db' => 'cat', |
| 240 | 240 | 'user' => 'kitty', |
| 241 | 241 | 'pass' => 'somepass', |
| 242 | - 'readonly' => FALSE,], |
|
| 242 | + 'readonly' => FALSE, ], |
|
| 243 | 243 | // this slice of DB use is about user management in the user_options |
| 244 | 244 | // table. Giving the corresponding user only read-only access means that |
| 245 | 245 | // all user properties have to "magically" occur in the table by OOB |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | 'db' => 'cat', |
| 251 | 251 | 'user' => 'kitty', |
| 252 | 252 | 'pass' => 'somepass', |
| 253 | - 'readonly' => FALSE,], |
|
| 253 | + 'readonly' => FALSE, ], |
|
| 254 | 254 | /* If you use this tool in conjunction with an external customer management database, you can configure that every |
| 255 | 255 | * institution entry in CAT MUST correspond to a customer entry in an external database. If you want this, set this |
| 256 | 256 | * config variable to TRUE. |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | 'db' => 'customer_db', |
| 277 | 277 | 'user' => 'customerservice', |
| 278 | 278 | 'pass' => '2lame4u', |
| 279 | - 'readonly' => TRUE,], |
|
| 279 | + 'readonly' => TRUE, ], |
|
| 280 | 280 | /* |
| 281 | 281 | * EXTERNAL_SOURCE is the source only used in the caching script, if you |
| 282 | 282 | * do not use local caching then these settings are irrelevant |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | 'db' => 'customer_db', |
| 287 | 287 | 'user' => 'customerservice', |
| 288 | 288 | 'pass' => '2lame4u', |
| 289 | - 'readonly' => TRUE,], |
|
| 289 | + 'readonly' => TRUE, ], |
|
| 290 | 290 | |
| 291 | 291 | 'enforce-external-sync' => TRUE, |
| 292 | 292 | ]; |
@@ -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"]; |
@@ -135,14 +135,14 @@ discard block |
||
| 135 | 135 | $modou = 1; |
| 136 | 136 | $ou = str_replace(",", "/,", $ou); |
| 137 | 137 | } |
| 138 | - $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 138 | + $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 139 | 139 | if (strlen($ou) >= 64) { |
| 140 | 140 | $ou = substr($ou, 0, 64); |
| 141 | 141 | $modou += 2; |
| 142 | 142 | } |
| 143 | 143 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 144 | 144 | $serverList = explode(",", $serverInfo["servers"]); |
| 145 | - $DN[] = "CN=" . $serverList[0]; |
|
| 145 | + $DN[] = "CN=".$serverList[0]; |
|
| 146 | 146 | switch ($serverInfo["type"]) { |
| 147 | 147 | case core\IdP::TYPE_IDPSP: |
| 148 | 148 | $policies[] = "eduroam IdP"; |
@@ -161,13 +161,13 @@ discard block |
||
| 161 | 161 | default: |
| 162 | 162 | throw new Exception("Sorry: Unknown level of issuance requested."); |
| 163 | 163 | } |
| 164 | - echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
|
| 164 | + echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties"); |
|
| 165 | 165 | echo "<ul>"; |
| 166 | - echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
|
| 167 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 166 | + echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>"; |
|
| 167 | + echo "<li>"._("Distinguished Name: ").implode(", ", $DN); |
|
| 168 | 168 | if ($modou > 0) { |
| 169 | 169 | echo " ("; |
| 170 | - echo _("Organization field adjusted"). ': '; |
|
| 170 | + echo _("Organization field adjusted").': '; |
|
| 171 | 171 | $desc = array(); |
| 172 | 172 | if ($modou >= 2) { |
| 173 | 173 | $desc[] = _("truncated to 64 chars"); |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | echo ")"; |
| 180 | 180 | } |
| 181 | 181 | echo "</li>"; |
| 182 | - echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
|
| 183 | - echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
|
| 182 | + echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>"; |
|
| 183 | + echo "<li>"._("Requester Contact Details: ").$firstName." <".$firstMail.">"."</li>"; |
|
| 184 | 184 | echo "</ul></p>"; |
| 185 | 185 | |
| 186 | 186 | $vettedCsr = $validator->string($_POST['CSR'], true); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $loggerInstance->debug(2, $DN, "CERT DN: ", "\n"); |
| 197 | 197 | // our certs can be good for max 5 years |
| 198 | 198 | $fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays); |
| 199 | - echo "<p>" . _("The certificate was requested.") . "</p>"; |
|
| 199 | + echo "<p>"._("The certificate was requested.")."</p>"; |
|
| 200 | 200 | ?> |
| 201 | 201 | <form action="overview_certificates.php" method="GET"> |
| 202 | 202 | <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button> |
@@ -214,23 +214,23 @@ discard block |
||
| 214 | 214 | switch (count($feds)) { |
| 215 | 215 | case 0: |
| 216 | 216 | echo "<div>"; |
| 217 | - 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.")); |
|
| 217 | + 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.")); |
|
| 218 | 218 | echo "</div>"; |
| 219 | 219 | break; |
| 220 | 220 | case 1: |
| 221 | - echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 222 | - echo " <strong>" . $cat->knownFederations[$feds[0]->tld] . "</strong>"; |
|
| 223 | - echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>'; |
|
| 221 | + echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 222 | + echo " <strong>".$cat->knownFederations[$feds[0]->tld]."</strong>"; |
|
| 223 | + echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>'; |
|
| 224 | 224 | break; |
| 225 | 225 | default: |
| 226 | - echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 226 | + echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 227 | 227 | ?> |
| 228 | 228 | <select name="NRO-list" id="NRO-list"> |
| 229 | 229 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 230 | 230 | <?php |
| 231 | 231 | foreach ($feds as $oneFed) { |
| 232 | 232 | #echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld] . "</option>"; |
| 233 | - echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>"; |
|
| 233 | + echo '<option value="AAA'.strtoupper($oneFed->tld).'">'.$oneIdP["names"][$langObject->getLang()]."</option>"; |
|
| 234 | 234 | |
| 235 | 235 | } |
| 236 | 236 | ?> |
@@ -241,13 +241,13 @@ discard block |
||
| 241 | 241 | ?> |
| 242 | 242 | <script> |
| 243 | 243 | var instservers = []; |
| 244 | - var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo));?>'; |
|
| 244 | + var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?>'; |
|
| 245 | 245 | <?php |
| 246 | 246 | $allIdPs = []; |
| 247 | 247 | foreach ($allAuthorizedFeds as $oneFed) { |
| 248 | 248 | foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) { |
| 249 | - $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["names"][$langObject->getLang()]; |
|
| 250 | - echo "instservers['" . $id . "']='" . str_replace(",", ", ", $oneIdP["servers"]) . "';\n"; |
|
| 249 | + $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["names"][$langObject->getLang()]; |
|
| 250 | + echo "instservers['".$id."']='".str_replace(",", ", ", $oneIdP["servers"])."';\n"; |
|
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | ?> |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 276 | 276 | <?php |
| 277 | 277 | foreach ($allIdPs as $id => $name) { |
| 278 | - echo '<option value="' . $id . '">' . $name . "</option>"; |
|
| 278 | + echo '<option value="'.$id.'">'.$name."</option>"; |
|
| 279 | 279 | } |
| 280 | 280 | ?> |
| 281 | 281 | </select> |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | <?php |
| 285 | 285 | echo _('According to the above settings you will receive') |
| 286 | 286 | ?> |
| 287 | - <span id='certlevel'><?php echo _('NRO level certificate');?></span> |
|
| 287 | + <span id='certlevel'><?php echo _('NRO level certificate'); ?></span> |
|
| 288 | 288 | |
| 289 | 289 | </span>for server names: |
| 290 | 290 | <span id='serversinfo'><?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?></span> |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | <?php |
| 293 | 293 | } else { |
| 294 | 294 | echo "<div>"; |
| 295 | - 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); |
|
| 295 | + 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); |
|
| 296 | 296 | echo "</div>"; |
| 297 | 297 | } |
| 298 | 298 | ?> |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | <h2><?php echo _("2. CSR generation"); ?></h2> |
| 303 | 303 | <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p> |
| 304 | 304 | <?php |
| 305 | - 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"; |
|
| 305 | + 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"; |
|
| 306 | 306 | ?> |
| 307 | 307 | <h2><?php echo _("3. Submission"); ?></h2> |
| 308 | 308 | <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/> |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | // for now (no OpenRoaming client certs available) only run server-side tests |
| 332 | 332 | foreach ($listOfIPs as $oneIP) { |
| 333 | 333 | $connectionResult = $connectionTests->cApathCheck($oneIP); |
| 334 | - if ($connectionResult != \core\diag\AbstractTest::RETVAL_OK || ( isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) { |
|
| 334 | + if ($connectionResult != \core\diag\AbstractTest::RETVAL_OK || (isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) { |
|
| 335 | 335 | $allHostsOkay = FALSE; |
| 336 | 336 | } else { |
| 337 | 337 | $oneHostOkay = TRUE; |
@@ -945,7 +945,7 @@ discard block |
||
| 945 | 945 | $profileStatus = self::CERT_STATUS_NONE; |
| 946 | 946 | foreach ($rows as $row) { |
| 947 | 947 | $encodedCert = $row[0]; |
| 948 | - $tm = $x509->processCertificate(base64_decode($encodedCert))['full_details']['validTo_time_t']- time(); |
|
| 948 | + $tm = $x509->processCertificate(base64_decode($encodedCert))['full_details']['validTo_time_t'] - time(); |
|
| 949 | 949 | if ($tm < \config\ConfAssistant::CERT_WARNINGS['expiry_critical']) { |
| 950 | 950 | $certStatus = self::CERT_STATUS_ERROR; |
| 951 | 951 | } elseif ($tm < \config\ConfAssistant::CERT_WARNINGS['expiry_warning']) { |
@@ -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/>"; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | if ($theProfile->isRedirected()) { |
| 148 | 148 | $iconData = $uiElements->iconData('PROFILES_REDIRECTED'); |
| 149 | 149 | $iconData['text'] = _("Profile redirected"); |
| 150 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 150 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 151 | 151 | |
| 152 | 152 | } |
| 153 | 153 | |
@@ -155,15 +155,15 @@ discard block |
||
| 155 | 155 | switch ($certStatus) { |
| 156 | 156 | case core\AbstractProfile::CERT_STATUS_OK: |
| 157 | 157 | $iconData = $uiElements->iconData('CERT_STATUS_OK'); |
| 158 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 158 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 159 | 159 | break; |
| 160 | 160 | case core\AbstractProfile::CERT_STATUS_WARN: |
| 161 | 161 | $iconData = $uiElements->iconData('CERT_STATUS_WARN'); |
| 162 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 162 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 163 | 163 | break; |
| 164 | 164 | case core\AbstractProfile::CERT_STATUS_ERROR: |
| 165 | 165 | $iconData = $uiElements->iconData('CERT_STATUS_ERROR'); |
| 166 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 166 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 167 | 167 | break; |
| 168 | 168 | } |
| 169 | 169 | $buffer_headline .= "</div>"; |
@@ -189,11 +189,11 @@ discard block |
||
| 189 | 189 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
| 190 | 190 | $diagUrl = "../diag/"; |
| 191 | 191 | } else { |
| 192 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
| 192 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
| 193 | 193 | } |
| 194 | 194 | ?> |
| 195 | - <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 196 | - <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 195 | + <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 196 | + <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 197 | 197 | <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!"); ?>'> |
| 198 | 198 | <?php echo _("Check realm reachability"); ?> |
| 199 | 199 | </button> |
@@ -235,9 +235,9 @@ discard block |
||
| 235 | 235 | ?> |
| 236 | 236 | <div style='display: flex;'> |
| 237 | 237 | <?php |
| 238 | - $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution; |
|
| 239 | - $displayurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 240 | - $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 238 | + $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution; |
|
| 239 | + $displayurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 240 | + $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 241 | 241 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
| 242 | 242 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
| 243 | 243 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -249,9 +249,9 @@ discard block |
||
| 249 | 249 | if (empty($rawQr)) { |
| 250 | 250 | throw new Exception("Something went seriously wrong during QR code generation!"); |
| 251 | 251 | } |
| 252 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 252 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 253 | 253 | $size = getimagesize($uri); |
| 254 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
| 254 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
| 255 | 255 | |
| 256 | 256 | //echo "<nobr>$displayurl</nobr></a>"; |
| 257 | 257 | echo "<p>$displayurl</p></a>"; |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | <h2><?php |
| 296 | 296 | switch ($deploymentObject->consortium) { |
| 297 | 297 | case "eduroam": |
| 298 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME; |
|
| 298 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME; |
|
| 299 | 299 | break; |
| 300 | 300 | case "OpenRoaming": |
| 301 | 301 | $displayname = "OpenRoaming ANP"; |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | default: |
| 304 | 304 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
| 305 | 305 | } |
| 306 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
| 306 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
| 307 | 307 | ?></h2> |
| 308 | 308 | <table> |
| 309 | 309 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -317,13 +317,13 @@ discard block |
||
| 317 | 317 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
| 318 | 318 | <?php |
| 319 | 319 | if ($deploymentObject->host1_v4 !== NULL) { |
| 320 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
| 320 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
| 321 | 321 | } |
| 322 | 322 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
| 323 | 323 | echo "<br/>"; |
| 324 | 324 | } |
| 325 | 325 | if ($deploymentObject->host1_v6 !== NULL) { |
| 326 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
| 326 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
| 327 | 327 | } |
| 328 | 328 | ?> |
| 329 | 329 | </td> |
@@ -331,9 +331,9 @@ discard block |
||
| 331 | 331 | <td><?php echo $deploymentObject->port1; ?></td> |
| 332 | 332 | <td> |
| 333 | 333 | <?php |
| 334 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 335 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 336 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>"; |
|
| 334 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 335 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 336 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>"; |
|
| 337 | 337 | ?> |
| 338 | 338 | </td> |
| 339 | 339 | </tr> |
@@ -341,22 +341,22 @@ discard block |
||
| 341 | 341 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
| 342 | 342 | <?php |
| 343 | 343 | if ($deploymentObject->host2_v4 !== NULL) { |
| 344 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
| 344 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
| 345 | 345 | } |
| 346 | 346 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
| 347 | 347 | echo "<br/>"; |
| 348 | 348 | } |
| 349 | 349 | if ($deploymentObject->host2_v6 !== NULL) { |
| 350 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
| 350 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
| 351 | 351 | } |
| 352 | 352 | ?></td> |
| 353 | 353 | <td><?php echo _("RADIUS port number: ") ?></td> |
| 354 | 354 | <td><?php echo $deploymentObject->port2; ?></td> |
| 355 | 355 | <td> |
| 356 | 356 | <?php |
| 357 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 358 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 359 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>"; |
|
| 357 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 358 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 359 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>"; |
|
| 360 | 360 | ?> |
| 361 | 361 | </td> |
| 362 | 362 | </tr> |
@@ -408,12 +408,12 @@ discard block |
||
| 408 | 408 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
| 409 | 409 | echo '<br>'; |
| 410 | 410 | if ($res['FAILURE'] == 2) { |
| 411 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
| 411 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
| 412 | 412 | } else { |
| 413 | 413 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 414 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
| 414 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
| 415 | 415 | } else { |
| 416 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
| 416 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
| 417 | 417 | } |
| 418 | 418 | } |
| 419 | 419 | } |
@@ -448,12 +448,12 @@ discard block |
||
| 448 | 448 | if ($res['FAILURE'] > 0) { |
| 449 | 449 | echo '<br>'; |
| 450 | 450 | if ($res['FAILURE'] == 2) { |
| 451 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
| 451 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
| 452 | 452 | } else { |
| 453 | 453 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 454 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
| 454 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
| 455 | 455 | } else { |
| 456 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
| 456 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | } |
@@ -474,24 +474,24 @@ discard block |
||
| 474 | 474 | </div> |
| 475 | 475 | <div style='width:20px;'></div> <!-- QR code space, reserved --> |
| 476 | 476 | <div style='display: table-cell; min-width:200px;'> |
| 477 | - <?php $tablecaption = _("Hotspot Usage Statistics");?> |
|
| 477 | + <?php $tablecaption = _("Hotspot Usage Statistics"); ?> |
|
| 478 | 478 | <h1><?php echo $tablecaption; ?></h1> |
| 479 | - <h2><?php echo _("5 most recent authentications");?></h2> |
|
| 480 | - <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p> |
|
| 479 | + <h2><?php echo _("5 most recent authentications"); ?></h2> |
|
| 480 | + <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p> |
|
| 481 | 481 | <table class='authrecord'> |
| 482 | - <caption><?php echo $tablecaption;?></caption> |
|
| 482 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 483 | 483 | <tr style='text-align: left;'> |
| 484 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
| 485 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
| 486 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
| 487 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
| 488 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
| 489 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
| 484 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
| 485 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
| 486 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
| 487 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
| 488 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
| 489 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
| 490 | 490 | </tr> |
| 491 | 491 | <?php |
| 492 | - $userAuthData = $deploymentObject->retrieveStatistics(0,5); |
|
| 492 | + $userAuthData = $deploymentObject->retrieveStatistics(0, 5); |
|
| 493 | 493 | foreach ($userAuthData as $oneRecord) { |
| 494 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
| 494 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
| 495 | 495 | . "<td>".$oneRecord['activity_time']."</td>" |
| 496 | 496 | . "<td>".$oneRecord['realm']."</td>" |
| 497 | 497 | . "<td>".$oneRecord['mac']."</td>" |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | <div> |
| 717 | 717 | <input type="hidden" name="consortium" value="eduroam"/> |
| 718 | 718 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
| 719 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 719 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 720 | 720 | </button> |
| 721 | 721 | <span style='color: red;'> |
| 722 | 722 | <?php if ($hasMail == 0) { |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | ?> |
| 31 | 31 | <?php |
| 32 | 32 | |
| 33 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 33 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 34 | 34 | |
| 35 | 35 | $auth = new \web\lib\admin\Authentication(); |
| 36 | 36 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -41,11 +41,11 @@ discard block |
||
| 41 | 41 | $auth->authenticate(); |
| 42 | 42 | |
| 43 | 43 | if (!isset($_GET['token'])) { |
| 44 | - $elements->errorPage(_("Error creating new IdP binding!"),_("This page needs to be called with a valid invitation token!")); |
|
| 44 | + $elements->errorPage(_("Error creating new IdP binding!"), _("This page needs to be called with a valid invitation token!")); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL && $_GET['token'] == "SELF-REGISTER") { |
| 48 | - $elements->errorPage(_("Error creating new IdP binding!"),_("You tried to register in self-service, but this deployment does not allow self-service!")); |
|
| 48 | + $elements->errorPage(_("Error creating new IdP binding!"), _("You tried to register in self-service, but this deployment does not allow self-service!")); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | switch ($_GET['token']) { |
@@ -55,23 +55,23 @@ discard block |
||
| 55 | 55 | $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration']; |
| 56 | 56 | break; |
| 57 | 57 | default: |
| 58 | - $tokenUnfiltered = $validator->token(filter_input(INPUT_GET,'token')); |
|
| 58 | + $tokenUnfiltered = $validator->token(filter_input(INPUT_GET, 'token')); |
|
| 59 | 59 | $token = htmlspecialchars(strip_tags($tokenUnfiltered)); |
| 60 | 60 | $checkval = $usermgmt->checkTokenValidity($token); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | if ($checkval < 0) { |
| 64 | 64 | echo $deco->pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP"); |
| 65 | - echo "<h1>" . _("Error creating new IdP binding!") . "</h1>"; |
|
| 65 | + echo "<h1>"._("Error creating new IdP binding!")."</h1>"; |
|
| 66 | 66 | switch ($checkval) { |
| 67 | 67 | case \core\UserManagement::TOKENSTATUS_FAIL_ALREADYCONSUMED: |
| 68 | - echo "<p>" . sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant) . "</p>"; |
|
| 68 | + echo "<p>".sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant)."</p>"; |
|
| 69 | 69 | break; |
| 70 | 70 | case \core\UserManagement::TOKENSTATUS_FAIL_EXPIRED: |
| 71 | - echo "<p>" . sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed) . "</p>"; |
|
| 71 | + echo "<p>".sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed)."</p>"; |
|
| 72 | 72 | break; |
| 73 | 73 | default: |
| 74 | - echo "<p>" . _("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.") . "</p>"; |
|
| 74 | + echo "<p>"._("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.")."</p>"; |
|
| 75 | 75 | } |
| 76 | 76 | echo $deco->footer(); |
| 77 | 77 | throw new Exception("Terminating because something is wrong with the token we received."); |
@@ -86,12 +86,12 @@ discard block |
||
| 86 | 86 | case "SELF-REGISTER": |
| 87 | 87 | $fed = new \core\Federation($federation); |
| 88 | 88 | $newidp = new \core\IdP($fed->newIdP(core\IdP::TYPE_IDPSP, $user, "FED", "SELFSERVICE")); |
| 89 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice registration"); |
|
| 89 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice registration"); |
|
| 90 | 90 | break; |
| 91 | 91 | default: |
| 92 | 92 | $newidp = $usermgmt->createIdPFromToken($token, $user); |
| 93 | 93 | $usermgmt->invalidateToken($token); |
| 94 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - Token used and invalidated"); |
|
| 94 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - Token used and invalidated"); |
|
| 95 | 95 | break; |
| 96 | 96 | } |
| 97 | 97 | |
@@ -115,12 +115,12 @@ discard block |
||
| 115 | 115 | $this->name = $this->languageInstance->getLocalisedValue($this->getAttributes('general:instname')); |
| 116 | 116 | $eligibility = $this->eligibility($instQuery->type); |
| 117 | 117 | if (in_array(IdP::ELIGIBILITY_IDP, $eligibility) && in_array(IdP::ELIGIBILITY_SP, $eligibility)) { |
| 118 | - $eligType = IdP::TYPE_IDPSP . ""; |
|
| 118 | + $eligType = IdP::TYPE_IDPSP.""; |
|
| 119 | 119 | $this->type = $eligType; |
| 120 | 120 | } elseif (in_array(IdP::ELIGIBILITY_IDP, $eligibility)) { |
| 121 | - $eligType = IdP::TYPE_IDP . ""; |
|
| 121 | + $eligType = IdP::TYPE_IDP.""; |
|
| 122 | 122 | } else { |
| 123 | - $eligType = IdP::TYPE_SP . ""; |
|
| 123 | + $eligType = IdP::TYPE_SP.""; |
|
| 124 | 124 | } |
| 125 | 125 | $this->type = $eligType; |
| 126 | 126 | $this->loggerInstance->debug(4, "--- END Constructing new IdP object $instId ... ---\n"); |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | public function listProfiles(bool $activeOnly = FALSE) |
| 136 | 136 | { |
| 137 | - $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier" . ($activeOnly ? " AND showtime = 1" : ""); |
|
| 137 | + $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier".($activeOnly ? " AND showtime = 1" : ""); |
|
| 138 | 138 | $allProfiles = $this->databaseHandle->exec($query); |
| 139 | 139 | $returnarray = []; |
| 140 | 140 | // SELECT -> resource, not boolean |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $returnarray[] = $oneProfile; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - $this->loggerInstance->debug(4, "listProfiles: " . /** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 147 | + $this->loggerInstance->debug(4, "listProfiles: "./** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 148 | 148 | return $returnarray; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | public function listDeployments(bool $activeOnly = FALSE) |
| 158 | 158 | { |
| 159 | - $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier" . ($activeOnly ? " AND status = " . AbstractDeployment::ACTIVE : ""); |
|
| 159 | + $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier".($activeOnly ? " AND status = ".AbstractDeployment::ACTIVE : ""); |
|
| 160 | 160 | $allDeployments = $this->databaseHandle->exec($query); |
| 161 | 161 | $returnarray = []; |
| 162 | 162 | // SELECT -> resource, not boolean |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $returnarray[] = new DeploymentManaged($this, $deploymentQuery->deployment_id); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - $this->loggerInstance->debug(4, "listDeployments: " . /** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 167 | + $this->loggerInstance->debug(4, "listDeployments: "./** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 168 | 168 | return $returnarray; |
| 169 | 169 | } |
| 170 | 170 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $redirectProfileIds = []; |
| 191 | 191 | $allProfileLevels = $this->databaseHandle->exec("SELECT profile_id, sufficient_config + showtime AS maxlevel FROM profile WHERE inst_id = $this->identifier ORDER BY maxlevel DESC"); |
| 192 | 192 | // SELECT yields a resource, not a boolean |
| 193 | - if ($allProfileLevels->num_rows == 0 ) { |
|
| 193 | + if ($allProfileLevels->num_rows == 0) { |
|
| 194 | 194 | return self::PROFILES_INCOMPLETE; |
| 195 | 195 | } |
| 196 | 196 | $allProfilesArray = $allProfileLevels->fetch_all(MYSQLI_ASSOC); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | $allProfiles = $this->databaseHandle->exec("SELECT MIN(openroaming) AS maxlevel FROM profile WHERE inst_id = $this->identifier"); |
| 219 | 219 | // SELECT yields a resource, not a boolean |
| 220 | 220 | while ($res = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allProfiles)) { |
| 221 | - return (is_numeric($res->maxlevel) ? (int)$res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO ); // insts without profiles should get a "NO" |
|
| 221 | + return (is_numeric($res->maxlevel) ? (int) $res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO); // insts without profiles should get a "NO" |
|
| 222 | 222 | } |
| 223 | 223 | return AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO; |
| 224 | 224 | } |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | case AbstractProfile::PROFILETYPE_SILVERBULLET: |
| 350 | 350 | $theProfile = new ProfileSilverbullet($identifier, $this); |
| 351 | 351 | $theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1); |
| 352 | - $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix'])); |
|
| 352 | + $theProfile->setRealm($this->identifier."-".$theProfile->identifier.".".strtolower($this->federation).strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix'])); |
|
| 353 | 353 | return $theProfile; |
| 354 | 354 | default: |
| 355 | 355 | throw new Exception("This type of profile is unknown and can not be added."); |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | public function getExternalDBId() |
| 493 | 493 | { |
| 494 | 494 | if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED |
| 495 | - $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = " . self::EXTERNAL_DB_SYNCSTATE_SYNCED); |
|
| 495 | + $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = ".self::EXTERNAL_DB_SYNCSTATE_SYNCED); |
|
| 496 | 496 | // SELECT -> it's a resource, not a boolean |
| 497 | 497 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $idQuery) == 0) { |
| 498 | 498 | return FALSE; |
@@ -558,16 +558,16 @@ discard block |
||
| 558 | 558 | } |
| 559 | 559 | foreach ($baseline as $lang => $value) { |
| 560 | 560 | if (!key_exists($lang, $newvalues)) { |
| 561 | - $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] DELETED"; |
|
| 561 | + $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] DELETED"; |
|
| 562 | 562 | } else { |
| 563 | 563 | if ($value != $newvalues[$lang]) { |
| 564 | - $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] CHANGED from '" . $baseline[$lang] . "' to '" . $newvalues[$lang] . "'"; |
|
| 564 | + $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] CHANGED from '".$baseline[$lang]."' to '".$newvalues[$lang]."'"; |
|
| 565 | 565 | } |
| 566 | 566 | } |
| 567 | 567 | } |
| 568 | 568 | foreach ($newvalues as $lang => $value) { |
| 569 | 569 | if (!key_exists($lang, $baseline)) { |
| 570 | - $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] ADDED as '" . $value . "'"; |
|
| 570 | + $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] ADDED as '".$value."'"; |
|
| 571 | 571 | } |
| 572 | 572 | } |
| 573 | 573 | return $retval; |
