@@ -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> |
@@ -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'], |
@@ -2,12 +2,12 @@ |
||
| 2 | 2 | define('SOCKET', '/opt/Socket/CAT_requests/queue'); |
| 3 | 3 | |
| 4 | 4 | function cat_socket($obj) { |
| 5 | - $sock = socket_create(AF_UNIX, SOCK_STREAM, 0); |
|
| 6 | - $conn = socket_connect($sock, SOCKET); |
|
| 7 | - if ( $conn ) { |
|
| 8 | - socket_write ($sock, $obj, strlen($obj)); |
|
| 9 | - $out = socket_read ($sock, 2048); |
|
| 10 | - return $out; |
|
| 11 | - } |
|
| 12 | - return 'FAILURE'; |
|
| 5 | + $sock = socket_create(AF_UNIX, SOCK_STREAM, 0); |
|
| 6 | + $conn = socket_connect($sock, SOCKET); |
|
| 7 | + if ( $conn ) { |
|
| 8 | + socket_write ($sock, $obj, strlen($obj)); |
|
| 9 | + $out = socket_read ($sock, 2048); |
|
| 10 | + return $out; |
|
| 11 | + } |
|
| 12 | + return 'FAILURE'; |
|
| 13 | 13 | } |
@@ -654,7 +654,7 @@ |
||
| 654 | 654 | </button> |
| 655 | 655 | <span style='color: red;'> |
| 656 | 656 | <?php if ($hasMail == 0) { |
| 657 | - echo _("Helpdesk mail address is required but missing!"); |
|
| 657 | + echo _("Helpdesk mail address is required but missing!"); |
|
| 658 | 658 | } |
| 659 | 659 | ?> |
| 660 | 660 | </span> |
@@ -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"> |