@@ -97,8 +97,7 @@ |
||
| 97 | 97 | // does the file exist in the current skin's directory? Has precedence |
| 98 | 98 | if ($submodule !== '' && file_exists(__DIR__ . "/../../skins/" . $this->skin . "/" . $submodule . $path . $filename)) { |
| 99 | 99 | $extrapath = "/skins/" . $this->skin . "/" . $submodule; |
| 100 | - } |
|
| 101 | - elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) { |
|
| 100 | + } elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) { |
|
| 102 | 101 | $extrapath = "/skins/" . $this->skin; |
| 103 | 102 | } elseif (file_exists(__DIR__ . "/../../" . $path . $filename)) { |
| 104 | 103 | $extrapath = ""; |
@@ -201,8 +201,7 @@ |
||
| 201 | 201 | |
| 202 | 202 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') { |
| 203 | 203 | $configRaw['use_other_tls_id'] = "True"; |
| 204 | - } |
|
| 205 | - else { |
|
| 204 | + } else { |
|
| 206 | 205 | $configRaw['use_other_tls_id'] = "False"; |
| 207 | 206 | } |
| 208 | 207 | |
@@ -607,8 +607,7 @@ |
||
| 607 | 607 | $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT); |
| 608 | 608 | if ($output === FALSE) { |
| 609 | 609 | $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg()); |
| 610 | - } |
|
| 611 | - else { |
|
| 610 | + } else { |
|
| 612 | 611 | echo $output; |
| 613 | 612 | } |
| 614 | 613 | } |
@@ -203,8 +203,7 @@ |
||
| 203 | 203 | |
| 204 | 204 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') { |
| 205 | 205 | $configRaw['USE_OTHER_TLS_ID'] = true; |
| 206 | - } |
|
| 207 | - else { |
|
| 206 | + } else { |
|
| 208 | 207 | $configRaw['USE_OTHER_TLS_ID'] = false; |
| 209 | 208 | } |
| 210 | 209 | |
@@ -755,7 +755,22 @@ |
||
| 755 | 755 | } |
| 756 | 756 | ?> |
| 757 | 757 | <div id="tabs-<?php echo $i;?>"> |
| 758 | - <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> |
|
| 758 | + <button id="run_<?php if ($i==3) { |
|
| 759 | + echo 'd'; |
|
| 760 | +} else { |
|
| 761 | + echo 'o'; |
|
| 762 | +} |
|
| 763 | +?>_tests"; onclick="run_<?php if ($i==3) { |
|
| 764 | + echo 'dynamic'; |
|
| 765 | +} else { |
|
| 766 | + echo 'openroaming'; |
|
| 767 | +} |
|
| 768 | +?>()"><?php if ($i==3) { |
|
| 769 | + echo _("Repeat dynamic connectivity tests"); |
|
| 770 | +} else { |
|
| 771 | + echo _("Repeat OpenRoaming connectivity tests"); |
|
| 772 | +} |
|
| 773 | +?></button> |
|
| 759 | 774 | |
| 760 | 775 | <?php |
| 761 | 776 | echo "<div id='"; |