@@ -440,7 +440,7 @@ discard block |
||
440 | 440 | <?php |
441 | 441 | if ($deploymentObject->radsec_cert != NULL) { |
442 | 442 | echo _('If your certificate is close to expiry or you need to create new RADSEC over TLS credentials') . '<br>' . |
443 | - _('click on "Renew RADSEC over TLS credentials" button'); |
|
443 | + _('click on "Renew RADSEC over TLS credentials" button'); |
|
444 | 444 | } |
445 | 445 | ?> |
446 | 446 | </td></tr> |
@@ -652,9 +652,9 @@ discard block |
||
652 | 652 | foreach (array($dsp->host1_v4, $dsp->host2_v4) as $host) { |
653 | 653 | $connection = @fsockopen($host, \config\Master::MANAGEDSP['radiusconfigport']); |
654 | 654 | if (is_resource($connection)) { |
655 | - fclose($connection); |
|
655 | + fclose($connection); |
|
656 | 656 | } else { |
657 | - return false; |
|
657 | + return false; |
|
658 | 658 | } |
659 | 659 | } |
660 | 660 | return true; |
@@ -887,7 +887,7 @@ discard block |
||
887 | 887 | </button> |
888 | 888 | <span style='color: red;'> |
889 | 889 | <?php if ($hasMail == 0) { |
890 | - echo _("Helpdesk mail address is required but missing!"); |
|
890 | + echo _("Helpdesk mail address is required but missing!"); |
|
891 | 891 | } |
892 | 892 | ?> |
893 | 893 | </span> |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | ?> |
29 | 29 | <?php |
30 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
30 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
31 | 31 | |
32 | 32 | function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) { |
33 | 33 | ?> |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | <ul style='margin:1px'> |
45 | 45 | <?php |
46 | 46 | foreach ($completeness as $missing_attrib) { |
47 | - echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
47 | + echo "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
48 | 48 | } |
49 | 49 | ?> |
50 | 50 | </ul> |
51 | 51 | </div> |
52 | 52 | <?php |
53 | 53 | } else { |
54 | - 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 | + 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); |
|
55 | 55 | } |
56 | 56 | ?> |
57 | 57 | <br/> |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | if ($readonly === FALSE) { |
61 | 61 | ?> |
62 | 62 | <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&profile_id=<?php echo $theProfile->identifier; ?>' method='POST'> |
63 | - <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
63 | + <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
64 | 64 | </form> |
65 | 65 | <?php |
66 | 66 | } |
@@ -96,21 +96,21 @@ discard block |
||
96 | 96 | $has_overrides = TRUE; |
97 | 97 | } |
98 | 98 | } |
99 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
99 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>"; |
|
100 | 100 | $typelist = $theProfile->getEapMethodsinOrderOfPreference(); |
101 | 101 | $allcomplete = TRUE; |
102 | 102 | foreach ($typelist as $eaptype) { |
103 | 103 | $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
104 | 104 | $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype); |
105 | 105 | if ($completeness === true) { |
106 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
106 | + $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>"; |
|
107 | 107 | } else { |
108 | 108 | $buffer_eaptypediv .= " <div class='notacceptable'>"; |
109 | 109 | $buffer_eaptypediv .= _("Information needed!"); |
110 | 110 | if (is_array($completeness)) { |
111 | 111 | $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
112 | 112 | foreach ($completeness as $missing_attrib) { |
113 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
113 | + $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
114 | 114 | } |
115 | 115 | $buffer_eaptypediv .= "</ul>"; |
116 | 116 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | foreach ($attribs as $attrib) { |
123 | 123 | if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
124 | 124 | $justOnce = TRUE; |
125 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
125 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='"._("Options on EAP Method/Device level are in effect.")."'>"; |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | $buffer_eaptypediv .= "<br/>"; |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | if ($theProfile->isRedirected()) { |
149 | 149 | $iconData = $uiElements->iconData('PROFILES_REDIRECTED'); |
150 | 150 | $iconData['text'] = _("Profile redirected"); |
151 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
151 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
152 | 152 | |
153 | 153 | } |
154 | 154 | |
@@ -156,15 +156,15 @@ discard block |
||
156 | 156 | switch ($certStatus) { |
157 | 157 | case core\AbstractProfile::CERT_STATUS_OK: |
158 | 158 | $iconData = $uiElements->iconData('CERT_STATUS_OK'); |
159 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
159 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
160 | 160 | break; |
161 | 161 | case core\AbstractProfile::CERT_STATUS_WARN: |
162 | 162 | $iconData = $uiElements->iconData('CERT_STATUS_WARN'); |
163 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
163 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
164 | 164 | break; |
165 | 165 | case core\AbstractProfile::CERT_STATUS_ERROR: |
166 | 166 | $iconData = $uiElements->iconData('CERT_STATUS_ERROR'); |
167 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
167 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
168 | 168 | break; |
169 | 169 | } |
170 | 170 | $buffer_headline .= "</div>"; |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
191 | 191 | $diagUrl = "../diag/"; |
192 | 192 | } else { |
193 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
193 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
194 | 194 | } |
195 | 195 | ?> |
196 | - <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
197 | - <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/> |
|
196 | + <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
197 | + <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/> |
|
198 | 198 | <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!"); ?>'> |
199 | 199 | <?php echo _("Check realm reachability"); ?> |
200 | 200 | </button> |
@@ -241,9 +241,9 @@ discard block |
||
241 | 241 | ?> |
242 | 242 | <div style='display: flex;'> |
243 | 243 | <?php |
244 | - $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution; |
|
245 | - $displayurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
246 | - $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
244 | + $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution; |
|
245 | + $displayurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
246 | + $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
247 | 247 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
248 | 248 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
249 | 249 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -255,9 +255,9 @@ discard block |
||
255 | 255 | if (empty($rawQr)) { |
256 | 256 | throw new Exception("Something went seriously wrong during QR code generation!"); |
257 | 257 | } |
258 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
258 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
259 | 259 | $size = getimagesize($uri); |
260 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
260 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
261 | 261 | |
262 | 262 | //echo "<nobr>$displayurl</nobr></a>"; |
263 | 263 | echo "<p>$displayurl</p></a>"; |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | $radius_status = array(); |
287 | 287 | $radius_status[0] = $deploymentObject->radius_status_1; |
288 | 288 | $radius_status[1] = $deploymentObject->radius_status_2; |
289 | - $cacert = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
289 | + $cacert = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
290 | 290 | $retry = $deploymentObject->checkRADIUSHostandConfigDaemon(); |
291 | 291 | $isradiusready = radius_ready($deploymentObject); |
292 | 292 | if (is_array($retry)) { |
@@ -298,11 +298,11 @@ discard block |
||
298 | 298 | } |
299 | 299 | ?> |
300 | 300 | <div style='display: table-row_id;'> |
301 | - <div class='profilebox' id="profilebox_<?php echo $deploymentObject->identifier;?>" style='display: table-cell;'> |
|
301 | + <div class='profilebox' id="profilebox_<?php echo $deploymentObject->identifier; ?>" style='display: table-cell;'> |
|
302 | 302 | <h2><?php |
303 | 303 | switch ($deploymentObject->consortium) { |
304 | 304 | case "eduroam": |
305 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME; |
|
305 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME; |
|
306 | 306 | break; |
307 | 307 | case "OpenRoaming": |
308 | 308 | $displayname = "OpenRoaming ANP"; |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | default: |
311 | 311 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
312 | 312 | } |
313 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
313 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
314 | 314 | ?></h2> |
315 | 315 | <table> |
316 | 316 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -328,13 +328,13 @@ discard block |
||
328 | 328 | <td> |
329 | 329 | <?php |
330 | 330 | if ($deploymentObject->host1_v4 !== NULL) { |
331 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
331 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
332 | 332 | } |
333 | 333 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
334 | 334 | echo "<br/>"; |
335 | 335 | } |
336 | 336 | if ($deploymentObject->host1_v6 !== NULL) { |
337 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
337 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
338 | 338 | } |
339 | 339 | ?> |
340 | 340 | </td> |
@@ -350,9 +350,9 @@ discard block |
||
350 | 350 | <td> |
351 | 351 | <?php |
352 | 352 | if ($deploymentObject->status) { |
353 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
354 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
355 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>"; |
|
353 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
354 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
355 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>"; |
|
356 | 356 | } |
357 | 357 | ?> |
358 | 358 | </td> |
@@ -364,13 +364,13 @@ discard block |
||
364 | 364 | <td> |
365 | 365 | <?php |
366 | 366 | if ($deploymentObject->host2_v4 !== NULL) { |
367 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
367 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
368 | 368 | } |
369 | 369 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
370 | 370 | echo "<br/>"; |
371 | 371 | } |
372 | 372 | if ($deploymentObject->host2_v6 !== NULL) { |
373 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
373 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
374 | 374 | } |
375 | 375 | ?> |
376 | 376 | </td> |
@@ -386,9 +386,9 @@ discard block |
||
386 | 386 | <td> |
387 | 387 | <?php |
388 | 388 | if ($deploymentObject->status) { |
389 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
390 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
391 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>"; |
|
389 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
390 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
391 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>"; |
|
392 | 392 | } |
393 | 393 | ?> |
394 | 394 | </td> |
@@ -417,29 +417,29 @@ discard block |
||
417 | 417 | <tr> |
418 | 418 | <td><strong><?php echo _("RADSEC over TLS credentials"); ?></strong></td> |
419 | 419 | <td> |
420 | - <input type="hidden" id="priv_key_data_<?php echo $deploymentObject->identifier;?>" value="<?php echo $deploymentObject->radsec_priv;?>"> |
|
421 | - <input type="hidden" id="cert_data_<?php echo $deploymentObject->identifier;?>" value="<?php echo $deploymentObject->radsec_cert;?>"> |
|
422 | - <input type="hidden" id="ca_cert_data" value="<?php echo $cacert;?>"> |
|
423 | - <button class="sp_priv_key" id="priv_key_<?php echo $deploymentObject->identifier;?>" name="showc" style="background-color: gray; color: white" type="submit"><?php echo _('private key');?></button> |
|
424 | - <button class="sp_cert" id="cert_<?php echo $deploymentObject->identifier;?>" name="showp" style="background-color: gray; color: white" type="submit"><?php echo _('certificate');?></button> |
|
425 | - <button class="ca_cert" name="showca" style="background-color: gray; color: white" type="submit"><?php echo _('CA certificate');?></button> |
|
426 | - <button name="sendzip" onclick="location.href='inc/sendzip.inc.php?inst_id=<?php echo $deploymentObject->institution;?>&dep_id=<?php echo $deploymentObject->identifier;?>'" style="background-color: gray; color: white" type="button"><?php echo _('download ZIP-file with full data');?></button> |
|
420 | + <input type="hidden" id="priv_key_data_<?php echo $deploymentObject->identifier; ?>" value="<?php echo $deploymentObject->radsec_priv; ?>"> |
|
421 | + <input type="hidden" id="cert_data_<?php echo $deploymentObject->identifier; ?>" value="<?php echo $deploymentObject->radsec_cert; ?>"> |
|
422 | + <input type="hidden" id="ca_cert_data" value="<?php echo $cacert; ?>"> |
|
423 | + <button class="sp_priv_key" id="priv_key_<?php echo $deploymentObject->identifier; ?>" name="showc" style="background-color: gray; color: white" type="submit"><?php echo _('private key'); ?></button> |
|
424 | + <button class="sp_cert" id="cert_<?php echo $deploymentObject->identifier; ?>" name="showp" style="background-color: gray; color: white" type="submit"><?php echo _('certificate'); ?></button> |
|
425 | + <button class="ca_cert" name="showca" style="background-color: gray; color: white" type="submit"><?php echo _('CA certificate'); ?></button> |
|
426 | + <button name="sendzip" onclick="location.href='inc/sendzip.inc.php?inst_id=<?php echo $deploymentObject->institution; ?>&dep_id=<?php echo $deploymentObject->identifier; ?>'" style="background-color: gray; color: white" type="button"><?php echo _('download ZIP-file with full data'); ?></button> |
|
427 | 427 | </td |
428 | 428 | </tr> |
429 | 429 | <tr> <td></td><td> |
430 | 430 | <?php |
431 | - echo _('Not valid after:') . ' '. date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s') . ' UTC'; |
|
432 | - $dleft = floor(($data['validTo_time_t']-time())/(24*60*60)); |
|
431 | + echo _('Not valid after:').' '.date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s').' UTC'; |
|
432 | + $dleft = floor(($data['validTo_time_t'] - time()) / (24 * 60 * 60)); |
|
433 | 433 | if ($dleft > 0) { |
434 | - echo '<br>' . _('Number of days to expiry:') . ' ' . $dleft; |
|
434 | + echo '<br>'._('Number of days to expiry:').' '.$dleft; |
|
435 | 435 | } else { |
436 | - echo '<br>' . _('If you are using RADSEC over TLS you should urgently renew your credentisls') . '!'; |
|
436 | + echo '<br>'._('If you are using RADSEC over TLS you should urgently renew your credentisls').'!'; |
|
437 | 437 | } |
438 | 438 | ?></td></tr> |
439 | 439 | <tr> <td></td><td> |
440 | 440 | <?php |
441 | 441 | if ($deploymentObject->radsec_cert != NULL) { |
442 | - echo _('If your certificate is close to expiry or you need to create new RADSEC over TLS credentials') . '<br>' . |
|
442 | + echo _('If your certificate is close to expiry or you need to create new RADSEC over TLS credentials').'<br>'. |
|
443 | 443 | _('click on "Renew RADSEC over TLS credentials" button'); |
444 | 444 | } |
445 | 445 | ?> |
@@ -451,14 +451,14 @@ discard block |
||
451 | 451 | <tr> |
452 | 452 | <td><strong><?php echo _("RADSEC TLS-PSK identity"); ?></strong></td> |
453 | 453 | <td> |
454 | - SP_<?php echo $deploymentObject->identifier . '-' . $deploymentObject->institution;?> |
|
454 | + SP_<?php echo $deploymentObject->identifier.'-'.$deploymentObject->institution; ?> |
|
455 | 455 | </td> |
456 | 456 | </tr> |
457 | 457 | |
458 | 458 | <tr> |
459 | 459 | <td><strong><?php echo _("RADSEC TLS-PSK key"); ?></strong></td> |
460 | 460 | <td> |
461 | - <?php echo $deploymentObject->pskkey;?> |
|
461 | + <?php echo $deploymentObject->pskkey; ?> |
|
462 | 462 | </td> |
463 | 463 | </tr> |
464 | 464 | <?php } ?> |
@@ -515,12 +515,12 @@ discard block |
||
515 | 515 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
516 | 516 | echo '<br>'; |
517 | 517 | if ($res['FAILURE'] == 2) { |
518 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
518 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
519 | 519 | } else { |
520 | 520 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
521 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
521 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
522 | 522 | } else { |
523 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
523 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
524 | 524 | } |
525 | 525 | } |
526 | 526 | } |
@@ -555,12 +555,12 @@ discard block |
||
555 | 555 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
556 | 556 | echo '<br>'; |
557 | 557 | if ($res['FAILURE'] == 2) { |
558 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
558 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
559 | 559 | } else { |
560 | 560 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
561 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
561 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
562 | 562 | } else { |
563 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
563 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
564 | 564 | } |
565 | 565 | } |
566 | 566 | } |
@@ -585,28 +585,28 @@ discard block |
||
585 | 585 | </form> |
586 | 586 | </div> |
587 | 587 | </div> |
588 | - <?php } else { echo _("We are not able to handle a new configuration request now.") . '<br>' . _("Check later.");} ?> |
|
588 | + <?php } else { echo _("We are not able to handle a new configuration request now.").'<br>'._("Check later."); } ?> |
|
589 | 589 | </div> |
590 | 590 | <div style='width:20px;'></div> <!-- QR code space, reserved --> |
591 | 591 | <div style='display: table-cell; min-width:200px;'> |
592 | - <?php $tablecaption = _("Hotspot Usage Statistics");?> |
|
592 | + <?php $tablecaption = _("Hotspot Usage Statistics"); ?> |
|
593 | 593 | <h1><?php echo $tablecaption; ?></h1> |
594 | - <h2><?php echo _("5 most recent authentications");?></h2> |
|
595 | - <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p> |
|
594 | + <h2><?php echo _("5 most recent authentications"); ?></h2> |
|
595 | + <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p> |
|
596 | 596 | <table class='authrecord'> |
597 | - <caption><?php echo $tablecaption;?></caption> |
|
597 | + <caption><?php echo $tablecaption; ?></caption> |
|
598 | 598 | <tr style='text-align: left;'> |
599 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
600 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
601 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
602 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
603 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
604 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
599 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
600 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
601 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
602 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
603 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
604 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
605 | 605 | </tr> |
606 | 606 | <?php |
607 | - $userAuthData = $deploymentObject->retrieveStatistics(0,5); |
|
607 | + $userAuthData = $deploymentObject->retrieveStatistics(0, 5); |
|
608 | 608 | foreach ($userAuthData as $oneRecord) { |
609 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
609 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
610 | 610 | . "<td>".$oneRecord['activity_time']."</td>" |
611 | 611 | . "<td>".$oneRecord['realm']."</td>" |
612 | 612 | . "<td>".$oneRecord['mac']."</td>" |
@@ -814,7 +814,7 @@ discard block |
||
814 | 814 | } |
815 | 815 | ?> |
816 | 816 | </h2> |
817 | - <?php if(count($profiles_for_this_idp) > 1 && $readonly === FALSE && $editMode === 'fullaccess') { ?> |
|
817 | + <?php if (count($profiles_for_this_idp) > 1 && $readonly === FALSE && $editMode === 'fullaccess') { ?> |
|
818 | 818 | <form method='post' action='sort_profiles.php?inst_id=<?php echo $my_inst->identifier; ?>' accept-charset='UTF-8'> |
819 | 819 | <div> |
820 | 820 | <button type='submit' name='profile_sorting'> |
@@ -883,7 +883,7 @@ discard block |
||
883 | 883 | <div> |
884 | 884 | <input type="hidden" name="consortium" value="eduroam"/> |
885 | 885 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
886 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
886 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
887 | 887 | </button> |
888 | 888 | <span style='color: red;'> |
889 | 889 | <?php if ($hasMail == 0) { |