@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <?php |
29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) { |
32 | 32 | ?> |
@@ -43,14 +43,14 @@ discard block |
||
43 | 43 | <ul style='margin:1px'> |
44 | 44 | <?php |
45 | 45 | foreach ($completeness as $missing_attrib) { |
46 | - echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
46 | + echo "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
47 | 47 | } |
48 | 48 | ?> |
49 | 49 | </ul> |
50 | 50 | </div> |
51 | 51 | <?php |
52 | 52 | } else { |
53 | - echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
53 | + echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
54 | 54 | } |
55 | 55 | ?> |
56 | 56 | <br/> |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | if ($readonly === FALSE) { |
60 | 60 | ?> |
61 | 61 | <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&profile_id=<?php echo $theProfile->identifier; ?>' method='POST'> |
62 | - <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
62 | + <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
63 | 63 | </form> |
64 | 64 | <?php |
65 | 65 | } |
@@ -94,21 +94,21 @@ discard block |
||
94 | 94 | $has_overrides = TRUE; |
95 | 95 | } |
96 | 96 | } |
97 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
97 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>"; |
|
98 | 98 | $typelist = $theProfile->getEapMethodsinOrderOfPreference(); |
99 | 99 | $allcomplete = TRUE; |
100 | 100 | foreach ($typelist as $eaptype) { |
101 | 101 | $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
102 | 102 | $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype); |
103 | 103 | if ($completeness === true) { |
104 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
104 | + $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>"; |
|
105 | 105 | } else { |
106 | 106 | $buffer_eaptypediv .= " <div class='notacceptable'>"; |
107 | 107 | $buffer_eaptypediv .= _("Information needed!"); |
108 | 108 | if (is_array($completeness)) { |
109 | 109 | $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
110 | 110 | foreach ($completeness as $missing_attrib) { |
111 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
111 | + $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
112 | 112 | } |
113 | 113 | $buffer_eaptypediv .= "</ul>"; |
114 | 114 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | foreach ($attribs as $attrib) { |
121 | 121 | if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
122 | 122 | $justOnce = TRUE; |
123 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
123 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>"; |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | $buffer_eaptypediv .= "<br/>"; |
@@ -166,11 +166,11 @@ discard block |
||
166 | 166 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
167 | 167 | $diagUrl = "../diag/"; |
168 | 168 | } else { |
169 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
169 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
170 | 170 | } |
171 | 171 | ?> |
172 | - <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
173 | - <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/> |
|
172 | + <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
173 | + <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/> |
|
174 | 174 | <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'> |
175 | 175 | <?php echo _("Check realm reachability"); ?> |
176 | 176 | </button> |
@@ -203,9 +203,9 @@ discard block |
||
203 | 203 | ?> |
204 | 204 | <div style='display: flex;'> |
205 | 205 | <?php |
206 | - $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution; |
|
207 | - $displayurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
208 | - $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
206 | + $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution; |
|
207 | + $displayurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
208 | + $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
209 | 209 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
210 | 210 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
211 | 211 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | if (empty($rawQr)) { |
218 | 218 | throw new Exception("Something went seriously wrong during QR code generation!"); |
219 | 219 | } |
220 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
220 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
221 | 221 | $size = getimagesize($uri); |
222 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
222 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
223 | 223 | |
224 | 224 | //echo "<nobr>$displayurl</nobr></a>"; |
225 | 225 | echo "<p>$displayurl</p></a>"; |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | <h2><?php |
264 | 264 | switch ($deploymentObject->consortium) { |
265 | 265 | case "eduroam": |
266 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME; |
|
266 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME; |
|
267 | 267 | break; |
268 | 268 | case "OpenRoaming": |
269 | 269 | $displayname = "OpenRoaming ANP"; |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | default: |
272 | 272 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
273 | 273 | } |
274 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
274 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
275 | 275 | ?></h2> |
276 | 276 | <table> |
277 | 277 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -285,13 +285,13 @@ discard block |
||
285 | 285 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
286 | 286 | <?php |
287 | 287 | if ($deploymentObject->host1_v4 !== NULL) { |
288 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
288 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
289 | 289 | } |
290 | 290 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
291 | 291 | echo "<br/>"; |
292 | 292 | } |
293 | 293 | if ($deploymentObject->host1_v6 !== NULL) { |
294 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
294 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
295 | 295 | } |
296 | 296 | ?> |
297 | 297 | </td> |
@@ -299,9 +299,9 @@ discard block |
||
299 | 299 | <td><?php echo $deploymentObject->port1; ?></td> |
300 | 300 | <td> |
301 | 301 | <?php |
302 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
303 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
304 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
302 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
303 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
304 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>"; |
|
305 | 305 | ?> |
306 | 306 | </td> |
307 | 307 | </tr> |
@@ -309,22 +309,22 @@ discard block |
||
309 | 309 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
310 | 310 | <?php |
311 | 311 | if ($deploymentObject->host2_v4 !== NULL) { |
312 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
312 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
313 | 313 | } |
314 | 314 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
315 | 315 | echo "<br/>"; |
316 | 316 | } |
317 | 317 | if ($deploymentObject->host2_v6 !== NULL) { |
318 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
318 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
319 | 319 | } |
320 | 320 | ?></td> |
321 | 321 | <td><?php echo _("RADIUS port number: ") ?></td> |
322 | 322 | <td><?php echo $deploymentObject->port2; ?></td> |
323 | 323 | <td> |
324 | 324 | <?php |
325 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
326 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
327 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
325 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
326 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
327 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>"; |
|
328 | 328 | ?> |
329 | 329 | </td> |
330 | 330 | </tr> |
@@ -376,12 +376,12 @@ discard block |
||
376 | 376 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
377 | 377 | echo '<br>'; |
378 | 378 | if ($res['FAILURE'] == 2) { |
379 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
379 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
380 | 380 | } else { |
381 | 381 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
382 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
382 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
383 | 383 | } else { |
384 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
384 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
385 | 385 | } |
386 | 386 | } |
387 | 387 | } |
@@ -416,12 +416,12 @@ discard block |
||
416 | 416 | if ($res['FAILURE'] > 0) { |
417 | 417 | echo '<br>'; |
418 | 418 | if ($res['FAILURE'] == 2) { |
419 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
419 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
420 | 420 | } else { |
421 | 421 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
422 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
422 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
423 | 423 | } else { |
424 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
424 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
425 | 425 | } |
426 | 426 | } |
427 | 427 | } |
@@ -442,24 +442,24 @@ discard block |
||
442 | 442 | </div> |
443 | 443 | <div style='width:20px;'></div> <!-- QR code space, reserved --> |
444 | 444 | <div style='display: table-cell; min-width:200px;'> |
445 | - <?php $tablecaption = _("Hotspot Usage Statistics");?> |
|
445 | + <?php $tablecaption = _("Hotspot Usage Statistics"); ?> |
|
446 | 446 | <h1><?php echo $tablecaption; ?></h1> |
447 | - <h2><?php echo _("5 most recent authentications");?></h2> |
|
448 | - <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p> |
|
447 | + <h2><?php echo _("5 most recent authentications"); ?></h2> |
|
448 | + <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p> |
|
449 | 449 | <table class='authrecord'> |
450 | - <caption><?php echo $tablecaption;?></caption> |
|
450 | + <caption><?php echo $tablecaption; ?></caption> |
|
451 | 451 | <tr style='text-align: left;'> |
452 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
453 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
454 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
455 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
456 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
457 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
452 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
453 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
454 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
455 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
456 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
457 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
458 | 458 | </tr> |
459 | 459 | <?php |
460 | - $userAuthData = $deploymentObject->retrieveStatistics(0,5); |
|
460 | + $userAuthData = $deploymentObject->retrieveStatistics(0, 5); |
|
461 | 461 | foreach ($userAuthData as $oneRecord) { |
462 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
462 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
463 | 463 | . "<td>".$oneRecord['activity_time']."</td>" |
464 | 464 | . "<td>".$oneRecord['realm']."</td>" |
465 | 465 | . "<td>".$oneRecord['mac']."</td>" |
@@ -670,7 +670,7 @@ discard block |
||
670 | 670 | <div> |
671 | 671 | <input type="hidden" name="consortium" value="eduroam"/> |
672 | 672 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
673 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
673 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
674 | 674 | </button> |
675 | 675 | <span style='color: red;'> |
676 | 676 | <?php if ($hasMail == 0) { |