@@ -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> |
@@ -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'], |
@@ -159,7 +159,7 @@ |
||
| 159 | 159 | echo "0\">"; |
| 160 | 160 | echo _("This service is for authenticated admins only.") . '<br>'; |
| 161 | 161 | echo "<a href=\"diag.php?admin=1\">" . |
| 162 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 162 | + _("eduroam® admin access is needed") . "</a>"; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | <div id="realm_problem"> |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * License: see the web/copyright.inc.php file in the file structure or |
| 20 | 20 | * <base_url>/copyright.php after deploying the software |
| 21 | 21 | */ |
| 22 | - ?> |
|
| 22 | + ?> |
|
| 23 | 23 | <?php |
| 24 | 24 | $Gui = new \web\lib\user\Gui(); |
| 25 | 25 | $Gui->languageInstance->setTextDomain("diagnostics"); |
@@ -326,9 +326,9 @@ |
||
| 326 | 326 | $otherTlsName = \core\common\Entity::getAttributeValue($this->attributes, 'eap-specific:tls_use_other_id', 0) === 'on' ? 'true' : 'false'; |
| 327 | 327 | if (isset(\core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0]) && |
| 328 | 328 | \core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0] === 'on') { |
| 329 | - $this->useGeantLink = true; |
|
| 329 | + $this->useGeantLink = true; |
|
| 330 | 330 | } else { |
| 331 | - $this->useGeantLink = false; |
|
| 331 | + $this->useGeantLink = false; |
|
| 332 | 332 | } |
| 333 | 333 | $eapConfig = $this->setEapObject(); |
| 334 | 334 | $eapConfig->setInnerType($this->selectedEap['INNER']); |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | " . $Tou['title'] . " |
| 52 | 52 | </h1> |
| 53 | 53 | <div id='tou_1'>" . $Tou['subtitle'] . |
| 54 | - '<div style="direction:ltr">' . $Tou['short'] . "</div> |
|
| 54 | + '<div style="direction:ltr">' . $Tou['short'] . "</div> |
|
| 55 | 55 | </div> |
| 56 | 56 | <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div> |
| 57 | 57 | <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" . |