|
@@ -19,7 +19,7 @@ discard block |
|
|
block discarded – undo |
|
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
|
$deco = new \web\lib\admin\PageDecoration(); |
|
25
|
25
|
$validator = new \web\lib\common\InputValidation(); |
|
@@ -44,9 +44,9 @@ discard block |
|
|
block discarded – undo |
|
44
|
44
|
|
|
45
|
45
|
$preflist = $my_profile->getEapMethodsinOrderOfPreference(); |
|
46
|
46
|
?> |
|
47
|
|
- <h1><?php $tablecaption = sprintf(_("Device compatiblity matrix for %s of %s "), $profile_name, $inst_name); echo $tablecaption;?></h1> |
|
|
47
|
+ <h1><?php $tablecaption = sprintf(_("Device compatiblity matrix for %s of %s "), $profile_name, $inst_name); echo $tablecaption; ?></h1> |
|
48
|
48
|
<table class="compatmatrix"> |
|
49
|
|
- <caption><?php echo $tablecaption;?></caption> |
|
|
49
|
+ <caption><?php echo $tablecaption; ?></caption> |
|
50
|
50
|
<tr> |
|
51
|
51
|
<th scope='col'></th> |
|
52
|
52
|
<th scope='col'><?php echo _("Device"); ?></th> |
|
@@ -54,10 +54,10 @@ discard block |
|
|
block discarded – undo |
|
54
|
54
|
<?php |
|
55
|
55
|
foreach ($preflist as $method) { |
|
56
|
56
|
$escapedMethod = $method->getIntegerRep(); |
|
57
|
|
- echo "<th scope='col' style='min-width:200px'>" . $method->getPrintableRep() . "<br/> |
|
|
57
|
+ echo "<th scope='col' style='min-width:200px'>".$method->getPrintableRep()."<br/> |
|
58
|
58
|
<form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
59
|
59
|
<input type='hidden' name='eaptype' value='$escapedMethod'> |
|
60
|
|
- <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button> |
|
|
60
|
+ <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button> |
|
61
|
61
|
</form></th>"; |
|
62
|
62
|
} |
|
63
|
63
|
?> |
|
@@ -73,10 +73,10 @@ discard block |
|
|
block discarded – undo |
|
73
|
73
|
foreach (\devices\Devices::listDevices() as $index => $description) { |
|
74
|
74
|
|
|
75
|
75
|
echo "<tr>"; |
|
76
|
|
- echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/> |
|
|
76
|
+ echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/> |
|
77
|
77
|
<form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
78
|
78
|
<input type='hidden' name='device' value='$index'> |
|
79
|
|
- <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button> |
|
|
79
|
+ <button class='redirect' type='submit'>"._("Device-specific options...")."</button> |
|
80
|
80
|
</form> |
|
81
|
81
|
</td>"; |
|
82
|
82
|
$factory = new \core\DeviceFactory($index); |
|
@@ -85,17 +85,17 @@ discard block |
|
|
block discarded – undo |
|
85
|
85
|
$footnotesForDevEapCombo = []; |
|
86
|
86
|
$display_footnote = FALSE; |
|
87
|
87
|
$langObject = new \core\common\Language(); |
|
88
|
|
- $downloadform = "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'> |
|
|
88
|
+ $downloadform = "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'> |
|
89
|
89
|
<input type='hidden' name='device' value='$index'/> |
|
90
|
90
|
<input type='hidden' name='generatedfor' value='admin'/> |
|
91
|
|
- <button class='download'>" . sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name']) . "</button> |
|
|
91
|
+ <button class='download'>".sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])."</button> |
|
92
|
92
|
</form> |
|
93
|
93
|
"; |
|
94
|
94
|
if (sizeof($my_profile->getAttributes("media:openroaming")) > 0 && isset($factory->device->options['hs20']) && $factory->device->options['hs20'] == 1) { |
|
95
|
|
- $downloadform .= "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&openroaming=1&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'> |
|
|
95
|
+ $downloadform .= "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&openroaming=1&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'> |
|
96
|
96
|
<input type='hidden' name='device' value='$index'/> |
|
97
|
97
|
<input type='hidden' name='generatedfor' value='admin'/> |
|
98
|
|
- <button class='download'>" . sprintf(_("%s + OpenRoaming<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name']) . "</button> |
|
|
98
|
+ <button class='download'>".sprintf(_("%s + OpenRoaming<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])."</button> |
|
99
|
99
|
</form> |
|
100
|
100
|
"; |
|
101
|
101
|
} |
|
@@ -165,8 +165,8 @@ discard block |
|
|
block discarded – undo |
|
165
|
165
|
</table> |
|
166
|
166
|
<p><strong><?php $tablecaption2 = _("Legend:"); echo $tablecaption2; ?></strong></p> |
|
167
|
167
|
<table class="compatmatrix"> |
|
168
|
|
- <caption><?php echo $tablecaption2;?></caption> |
|
169
|
|
- <tr><th scope="col"><?php echo _("Colour");?></th><th scope='col'><?php echo _("Meaning");?></th></tr> |
|
|
168
|
+ <caption><?php echo $tablecaption2; ?></caption> |
|
|
169
|
+ <tr><th scope="col"><?php echo _("Colour"); ?></th><th scope='col'><?php echo _("Meaning"); ?></th></tr> |
|
170
|
170
|
<tr><td class="compat_redirected"> </td> <td><?php echo _("redirection is set"); ?></td></tr> |
|
171
|
171
|
<tr><td class="compat_default"> </td> <td><?php echo _("will be offered on download site"); ?></td></tr> |
|
172
|
172
|
<tr><td class="compat_secondary"> </td> <td><?php echo _("configured, but not preferred EAP type"); ?></td></tr> |
|
@@ -175,7 +175,7 @@ discard block |
|
|
block discarded – undo |
|
175
|
175
|
</table> |
|
176
|
176
|
<?php |
|
177
|
177
|
if (count($distinctFootnotes)) { |
|
178
|
|
- echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>"; |
|
|
178
|
+ echo "<p><strong>"._("Footnotes:")."</strong></p><table>"; |
|
179
|
179
|
foreach ($distinctFootnotes as $number => $text) { |
|
180
|
180
|
echo "<tr><td>($number) - </td><td>$text</td></tr>"; |
|
181
|
181
|
} |
GEANT /
CAT
