|
@@ -42,24 +42,24 @@ |
|
|
block discarded – undo |
|
42
|
42
|
\config\ConfAssistant::CONSORTIUM['display_name'], |
|
43
|
43
|
\config\Master::APPEARANCE['productname'], |
|
44
|
44
|
\config\Master::APPEARANCE['productname']); |
|
45
|
|
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>"; |
|
46
|
|
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>"; |
|
|
45
|
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>"; |
|
|
46
|
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>"; |
|
47
|
47
|
foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) { |
|
48
|
|
- $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>"; |
|
|
48
|
+ $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>"; |
|
49
|
49
|
} |
|
50
|
50
|
$out .= "</tr>"; |
|
51
|
51
|
foreach (\devices\Devices::listDevices() as $index => $onedevice) { |
|
52
|
52
|
if (isset($onedevice['options'])) { |
|
53
|
|
- if ((isset($onedevice['options']['hidden']) && ( $onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2 ))|| (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) { |
|
|
53
|
+ if ((isset($onedevice['options']['hidden']) && ($onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2)) || (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) { |
|
54
|
54
|
continue; |
|
55
|
55
|
} |
|
56
|
56
|
} |
|
57
|
|
- $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png"); |
|
|
57
|
+ $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png"); |
|
58
|
58
|
$vendorImg = ""; |
|
59
|
59
|
if ($vendor !== FALSE) { |
|
60
|
60
|
$vendorImg = "<img src='$vendor' alt='logo'>"; |
|
61
|
61
|
} |
|
62
|
|
- $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>"; |
|
|
62
|
+ $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>"; |
|
63
|
63
|
$device_instance = new \core\DeviceFactory($index); |
|
64
|
64
|
foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) { |
|
65
|
65
|
$out .= "<td>"; |
GEANT /
CAT
