@@ -236,7 +236,7 @@ |
||
236 | 236 | const AUXATTRIB_SB_USERNAME = "ATTRIB-MANAGED-USERNAME"; |
237 | 237 | const AUXATTRIB_SB_USERID = "ATTRIB-MANAGED-USERID"; |
238 | 238 | const AUXATTRIB_SB_CERTSERIAL = "ATTRIB-MANAGED-CERTSERIAL"; |
239 | - const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
239 | + const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
240 | 240 | const AUXATTRIB_SB_CERTANNOTATION = "ATTRIB-MANAGED-CERTANNOTATION"; |
241 | 241 | const AUXATTRIB_SB_EXPIRY = "ATTRIB-MANAGED-EXPIRY"; /* MySQL timestamp format */ |
242 | 242 | const AUXATTRIB_TOKEN = "ATTRIB-TOKEN"; |
@@ -417,7 +417,7 @@ |
||
417 | 417 | $userId = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_USERID); |
418 | 418 | $userName = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_USERNAME); |
419 | 419 | $certSerial = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTSERIAL); |
420 | - $certCN = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTCN); |
|
420 | + $certCN = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTCN); |
|
421 | 421 | if ($userId === FALSE && $userName === FALSE && $certSerial === FALSE && $certCN === FALSE) { |
422 | 422 | // we need at least one of those |
423 | 423 | $adminApi->returnError(\web\lib\admin\API::ERROR_MISSING_PARAMETER, "At least one of User ID, Username, certificate serial, or certificate CN is required."); |
@@ -201,7 +201,7 @@ |
||
201 | 201 | } |
202 | 202 | |
203 | 203 | if (!empty($this->attributes['internal:realm'][0])) { |
204 | - $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
|
204 | + $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
@@ -197,7 +197,6 @@ |
||
197 | 197 | * - RETVAL_NOTCONFIGURED; needs \config\Diagnostics::RADIUSTESTS['TLS-discoverytag'] |
198 | 198 | * - RETVAL_INVALID (at least one format error) |
199 | 199 | * - RETVAL_OK (all fine) |
200 | - |
|
201 | 200 | * @return int one of two RETVALs above |
202 | 201 | */ |
203 | 202 | public function relevantNAPTRcompliance() |
@@ -109,7 +109,6 @@ |
||
109 | 109 | * ["my.server.name"] => "my.server.name" |
110 | 110 | * ["foo.bar.de", "baz.bar.ge"] => "e" |
111 | 111 | * ["server1.example.com", "server2.example.com", "serverN.example.com"] => ".example.com" |
112 | - |
|
113 | 112 | * @return string |
114 | 113 | */ |
115 | 114 | public function longestNameSuffix() |
@@ -34,13 +34,13 @@ |
||
34 | 34 | */ |
35 | 35 | class Diagnostics |
36 | 36 | { |
37 | - /** |
|
38 | - * Various paths. |
|
39 | - * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken. |
|
40 | - * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken. |
|
41 | - * See also NSIS_VERSION further down |
|
42 | - * @var array |
|
43 | - */ |
|
37 | + /** |
|
38 | + * Various paths. |
|
39 | + * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken. |
|
40 | + * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken. |
|
41 | + * See also NSIS_VERSION further down |
|
42 | + * @var array |
|
43 | + */ |
|
44 | 44 | const PATHS = [ |
45 | 45 | 'c_rehash' => 'c_rehash', |
46 | 46 | 'eapol_test' => 'eapol_test', |
@@ -522,7 +522,7 @@ discard block |
||
522 | 522 | if ( |
523 | 523 | get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigIos12plus" || |
524 | 524 | get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigOsX" |
525 | - ) { |
|
525 | + ) { |
|
526 | 526 | return "WPA2"; |
527 | 527 | } else { |
528 | 528 | return "WPA"; |
@@ -809,7 +809,7 @@ discard block |
||
809 | 809 | \core\common\Entity::$nomenclature_idp, |
810 | 810 | count($this->CAsAccountedFor)+1, |
811 | 811 | ($ca['root'] ? _("Root") : _("Intermediate"))) . |
812 | - "</string> |
|
812 | + "</string> |
|
813 | 813 | <key>PayloadIdentifier</key> |
814 | 814 | <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
815 | 815 | <key>PayloadOrganization</key> |
@@ -567,9 +567,9 @@ discard block |
||
567 | 567 | $naptr = $rfc7585suite->relevantNAPTR(); |
568 | 568 | if ($naptr == \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) { |
569 | 569 | if ($dynType == "") { |
570 | - echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>"; |
|
570 | + echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>"; |
|
571 | 571 | } else { |
572 | - echo "<tr><td>" . _("OpenRoaming connectivity test is not configured") . "</td><td>"; |
|
572 | + echo "<tr><td>" . _("OpenRoaming connectivity test is not configured") . "</td><td>"; |
|
573 | 573 | } |
574 | 574 | } else { |
575 | 575 | echo "<table>"; |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | echo "} |
674 | 674 | </script>"; |
675 | 675 | } else { |
676 | - echo ' |
|
676 | + echo ' |
|
677 | 677 | function run_openroaming() { |
678 | 678 | running_ajax_openroaming = 0; |
679 | 679 | $("#main_openroaming_ico").attr("src",icon_loading); |
@@ -695,10 +695,10 @@ discard block |
||
695 | 695 | } |
696 | 696 | } |
697 | 697 | if ($dynType == '') { |
698 | - $naptrs[0] = $naptr; |
|
699 | - } else { |
|
700 | - $naptrs[1] = $naptr; |
|
701 | - } |
|
698 | + $naptrs[0] = $naptr; |
|
699 | + } else { |
|
700 | + $naptrs[1] = $naptr; |
|
701 | + } |
|
702 | 702 | } |
703 | 703 | echo "<strong>" . _("Static connectivity tests") . "</strong> |
704 | 704 | <table><tr> |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | </tr></table>"; |
712 | 712 | } |
713 | 713 | if (count($orrealm) && ($naptrs[1] > 0)) { |
714 | - echo "<hr><strong>" . _("OpenRoaming connectivity tests") . "</strong> |
|
714 | + echo "<hr><strong>" . _("OpenRoaming connectivity tests") . "</strong> |
|
715 | 715 | <table><tr> |
716 | 716 | <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> |
717 | 717 | </tr></table>"; |
@@ -749,12 +749,12 @@ discard block |
||
749 | 749 | <?php |
750 | 750 | for ($i=3; $i<5; $i++) { |
751 | 751 | if ($i == 3 && $naptrs[0] <= 0) { |
752 | - continue; |
|
752 | + continue; |
|
753 | 753 | } |
754 | 754 | if ($i == 4) { |
755 | - if ((count($orrealm) == 0) || ($naptrs[1] <= 0)) { |
|
756 | - continue; |
|
757 | - } |
|
755 | + if ((count($orrealm) == 0) || ($naptrs[1] <= 0)) { |
|
756 | + continue; |
|
757 | + } |
|
758 | 758 | } |
759 | 759 | if ($i == 3) { |
760 | 760 | $rfc7585suite = $dnsChecks; |
@@ -771,16 +771,16 @@ discard block |
||
771 | 771 | echo "_tests'><fieldset class='option_container'> |
772 | 772 | <legend><strong>"; |
773 | 773 | if ($i==3) { |
774 | - echo _("DYNAMIC connectivity tests"); |
|
774 | + echo _("DYNAMIC connectivity tests"); |
|
775 | 775 | } else { |
776 | - echo _("OpenRoaming connectivity tests"); |
|
776 | + echo _("OpenRoaming connectivity tests"); |
|
777 | 777 | } |
778 | 778 | echo "</strong></legend>"; |
779 | 779 | $prefix1 = 'dynamic'; |
780 | 780 | $prefix2 = ''; |
781 | 781 | if ($i == 4) { |
782 | - $prefix1 = 'openroaming'; |
|
783 | - $prefix2 = $prefix1; |
|
782 | + $prefix1 = 'openroaming'; |
|
783 | + $prefix2 = $prefix1; |
|
784 | 784 | } |
785 | 785 | $resultstoprint = []; |
786 | 786 | if (count($rfc7585suite->NAPTR_hostname_records) > 0) { |
@@ -34,9 +34,9 @@ |
||
34 | 34 | $skinObject = new \web\lib\user\Skinjob("classic"); |
35 | 35 | /// eduroam CAT, twice the consortium name eduroam, twice eduroam CAT |
36 | 36 | $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform."), \config\Master::APPEARANCE['productname'])."<p>". |
37 | - sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
38 | - "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
39 | - "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
37 | + sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
38 | + "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
39 | + "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
40 | 40 | \config\Master::APPEARANCE['productname'], |
41 | 41 | \config\ConfAssistant::CONSORTIUM['display_name'], |
42 | 42 | \config\ConfAssistant::CONSORTIUM['display_name'], |