@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id; |
287 | 287 | } |
288 | 288 | if ($clients > $maxSupportedClients * 0.9) { |
289 | - $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!"); |
|
289 | + $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!"); |
|
290 | 290 | } |
291 | 291 | } |
292 | 292 | if (count($serverCandidates) == 0 && $federation != "DEFAULT") { |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND)"; |
326 | 326 | $conditional2 = ""; |
327 | 327 | } |
328 | - $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName ); |
|
328 | + $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName); |
|
329 | 329 | return mysqli_fetch_all($stats, \MYSQLI_ASSOC); |
330 | 330 | } |
331 | 331 | |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | $foundFreePort1 = 0; |
350 | 350 | while ($foundFreePort1 == 0) { |
351 | 351 | $portCandidate = random_int(1200, 65535); |
352 | - $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '" . $ourserver . "' AND port_instance_1 = $portCandidate"); |
|
352 | + $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '".$ourserver."' AND port_instance_1 = $portCandidate"); |
|
353 | 353 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) { |
354 | 354 | $foundFreePort1 = $portCandidate; |
355 | 355 | } |
@@ -358,14 +358,14 @@ discard block |
||
358 | 358 | $foundFreePort2 = 0; |
359 | 359 | while ($foundFreePort2 == 0) { |
360 | 360 | $portCandidate = random_int(1200, 65535); |
361 | - $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '" . $ourSecondServer . "' AND port_instance_2 = $portCandidate"); |
|
361 | + $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '".$ourSecondServer."' AND port_instance_2 = $portCandidate"); |
|
362 | 362 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) { |
363 | 363 | $foundFreePort2 = $portCandidate; |
364 | 364 | } |
365 | 365 | } |
366 | 366 | // and make up a shared secret that is halfways readable |
367 | 367 | $futureSecret = $this->randomString(16, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); |
368 | - $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '" . $ourserver . "', radius_instance_2 = '" . $ourSecondServer . "', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret', consortium = '$this->consortium' WHERE deployment_id = $this->identifier"); |
|
368 | + $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '".$ourserver."', radius_instance_2 = '".$ourSecondServer."', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret', consortium = '$this->consortium' WHERE deployment_id = $this->identifier"); |
|
369 | 369 | return ["port_instance_1" => $foundFreePort1, "port_instance_2" => $foundFreePort2, "secret" => $futureSecret, "radius_instance_1" => $ourserver, "radius_instance_2" => $ourserver]; |
370 | 370 | } |
371 | 371 | |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | */ |
413 | 413 | public function deactivate() |
414 | 414 | { |
415 | - $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::INACTIVE . " WHERE deployment_id = $this->identifier"); |
|
415 | + $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::INACTIVE." WHERE deployment_id = $this->identifier"); |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | /** |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | */ |
435 | 435 | public function activate() |
436 | 436 | { |
437 | - $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::ACTIVE . " WHERE deployment_id = $this->identifier"); |
|
437 | + $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::ACTIVE." WHERE deployment_id = $this->identifier"); |
|
438 | 438 | } |
439 | 439 | |
440 | 440 | /** |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | { |
447 | 447 | $customAttrib = $this->getAttributes("managedsp:operatorname"); |
448 | 448 | if (count($customAttrib) == 0) { |
449 | - return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
449 | + return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
450 | 450 | } |
451 | 451 | return $customAttrib[0]["value"]; |
452 | 452 | } |
@@ -462,13 +462,13 @@ discard block |
||
462 | 462 | { |
463 | 463 | |
464 | 464 | $hostname = "radius_hostname_$idx"; |
465 | - $ch = curl_init("http://" . $this->$hostname); |
|
465 | + $ch = curl_init("http://".$this->$hostname); |
|
466 | 466 | if ($ch === FALSE) { |
467 | 467 | $res = 'FAILURE'; |
468 | 468 | } else { |
469 | 469 | curl_setopt($ch, CURLOPT_POST, 1); |
470 | 470 | curl_setopt($ch, CURLOPT_POSTFIELDS, $post); |
471 | - $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $post\n"); |
|
471 | + $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $post\n"); |
|
472 | 472 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); |
473 | 473 | curl_setopt($ch, CURLOPT_HEADER, 0); |
474 | 474 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | $this->loggerInstance->debug(1, $this); |
485 | 485 | } |
486 | 486 | $this->loggerInstance->debug(1, "Database update"); |
487 | - $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = " . ($res == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE) . " WHERE deployment_id = $this->identifier"); |
|
487 | + $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = ".($res == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE)." WHERE deployment_id = $this->identifier"); |
|
488 | 488 | return $res; |
489 | 489 | } |
490 | 490 | |
@@ -505,19 +505,19 @@ discard block |
||
505 | 505 | } else { |
506 | 506 | $txt = $remove ? _('Profile deactivation failed') : _('Profile activation/modification failed'); |
507 | 507 | } |
508 | - $txt = $txt . ' '; |
|
508 | + $txt = $txt.' '; |
|
509 | 509 | if (array_count_values($response)[$status] == 2) { |
510 | - $txt = $txt . _('on both RADIUS servers: primary and backup') . '.'; |
|
510 | + $txt = $txt._('on both RADIUS servers: primary and backup').'.'; |
|
511 | 511 | } else { |
512 | 512 | if ($response['res[1]'] == $status) { |
513 | - $txt = $txt . _('on primary RADIUS server') . '.'; |
|
513 | + $txt = $txt._('on primary RADIUS server').'.'; |
|
514 | 514 | } else { |
515 | - $txt = $txt . _('on backup RADIUS server') . '.'; |
|
515 | + $txt = $txt._('on backup RADIUS server').'.'; |
|
516 | 516 | } |
517 | 517 | } |
518 | 518 | $mail = \core\common\OutsideComm::mailHandle(); |
519 | 519 | $email = $this->getAttributes("support:email")[0]['value']; |
520 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System"; |
|
520 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System"; |
|
521 | 521 | $mail->addAddress($email); |
522 | 522 | if ($status == 'OK') { |
523 | 523 | $mail->Subject = _('RADIUS profile update problem fixed'); |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | return NULL; |
552 | 552 | } |
553 | 553 | $timeout = 10; |
554 | - curl_setopt($ch, CURLOPT_URL, 'http://' . $host); |
|
554 | + curl_setopt($ch, CURLOPT_URL, 'http://'.$host); |
|
555 | 555 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
556 | 556 | curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
557 | 557 | curl_exec($ch); |
@@ -643,33 +643,33 @@ discard block |
||
643 | 643 | { |
644 | 644 | $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1; |
645 | 645 | $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => '')); |
646 | - $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&'; |
|
646 | + $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&'; |
|
647 | 647 | if ($remove) { |
648 | - $toPostTemplate = $toPostTemplate . 'remove=1&'; |
|
648 | + $toPostTemplate = $toPostTemplate.'remove=1&'; |
|
649 | 649 | } else { |
650 | - $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getOperatorName() . '&'; |
|
650 | + $toPostTemplate = $toPostTemplate.'operatorname='.$this->getOperatorName().'&'; |
|
651 | 651 | if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) { |
652 | 652 | $allRealms = $this->getAllRealms(); |
653 | 653 | if (!empty($allRealms)) { |
654 | - $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&'; |
|
655 | - $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&'; |
|
654 | + $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&'; |
|
655 | + $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&'; |
|
656 | 656 | } |
657 | 657 | } |
658 | 658 | } |
659 | 659 | foreach (array_keys($toPost) as $key) { |
660 | - $elem = 'port' . $key; |
|
661 | - $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem; |
|
660 | + $elem = 'port'.$key; |
|
661 | + $toPost[$key] = $toPostTemplate.'port='.$this->$elem; |
|
662 | 662 | } |
663 | 663 | $response = array(); |
664 | 664 | foreach ($toPost as $key => $value) { |
665 | - $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n"); |
|
666 | - $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
665 | + $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n"); |
|
666 | + $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
667 | 667 | } |
668 | 668 | if ($onlyone) { |
669 | - $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK; |
|
669 | + $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK; |
|
670 | 670 | } |
671 | 671 | foreach (array('OK', 'FAILURE') as $status) { |
672 | - if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) { |
|
672 | + if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) { |
|
673 | 673 | $this->sendMailtoAdmin($remove, $response, $status); |
674 | 674 | } |
675 | 675 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * ****************************************************************************** |
10 | 10 | */ |
11 | 11 | |
12 | -require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
12 | +require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
13 | 13 | |
14 | 14 | $auth = new \web\lib\admin\Authentication(); |
15 | 15 | $auth->authenticate(); |
@@ -38,18 +38,18 @@ discard block |
||
38 | 38 | |
39 | 39 | <h1><?php $tablecaption = _("Deployment Usage Records"); echo $tablecaption; ?></h1> |
40 | 40 | <table class='authrecord'> |
41 | - <caption><?php echo $tablecaption;?></caption> |
|
41 | + <caption><?php echo $tablecaption; ?></caption> |
|
42 | 42 | <tr> |
43 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
44 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
45 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
46 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
47 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
43 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
44 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
45 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
46 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
47 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
48 | 48 | </tr> |
49 | 49 | <?php |
50 | 50 | $userAuthData = $deployment->retrieveStatistics($backlogTime); |
51 | 51 | foreach ($userAuthData as $oneRecord) { |
52 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
52 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
53 | 53 | . "<td>".$oneRecord['activity_time']."</td>" |
54 | 54 | // $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here |
55 | 55 | . "<td>".$oneRecord['realm']."</td>" |
@@ -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 | } |
@@ -408,12 +408,12 @@ discard block |
||
408 | 408 | if ($res['FAILURE'] > 0) { |
409 | 409 | echo '<br>'; |
410 | 410 | if ($res['FAILURE'] == 2) { |
411 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
411 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
412 | 412 | } else { |
413 | 413 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
414 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
414 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
415 | 415 | } else { |
416 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
416 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
417 | 417 | } |
418 | 418 | } |
419 | 419 | } |
@@ -434,22 +434,22 @@ discard block |
||
434 | 434 | </div> |
435 | 435 | <div style='width:20px;'></div> <!-- QR code space, reserved --> |
436 | 436 | <div style='display: table-cell; min-width:200px;'> |
437 | - <?php $tablecaption = _("Hotspot Usage Statistics");?> |
|
437 | + <?php $tablecaption = _("Hotspot Usage Statistics"); ?> |
|
438 | 438 | <h1><?php echo $tablecaption; ?></h1> |
439 | - <h2><?php echo _("5 most recent authentications");?></h2> |
|
439 | + <h2><?php echo _("5 most recent authentications"); ?></h2> |
|
440 | 440 | <table class='authrecord'> |
441 | - <caption><?php echo $tablecaption;?></caption> |
|
441 | + <caption><?php echo $tablecaption; ?></caption> |
|
442 | 442 | <tr style='text-align: left;'> |
443 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
444 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
445 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
446 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
447 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
443 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
444 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
445 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
446 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
447 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
448 | 448 | </tr> |
449 | 449 | <?php |
450 | - $userAuthData = $deploymentObject->retrieveStatistics(0,5); |
|
450 | + $userAuthData = $deploymentObject->retrieveStatistics(0, 5); |
|
451 | 451 | foreach ($userAuthData as $oneRecord) { |
452 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
452 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
453 | 453 | . "<td>".$oneRecord['activity_time']."</td>" |
454 | 454 | . "<td>".$oneRecord['realm']."</td>" |
455 | 455 | . "<td>".$oneRecord['mac']."</td>" |
@@ -659,7 +659,7 @@ discard block |
||
659 | 659 | <div> |
660 | 660 | <input type="hidden" name="consortium" value="eduroam"/> |
661 | 661 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
662 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
662 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
663 | 663 | </button> |
664 | 664 | <span style='color: red;'> |
665 | 665 | <?php if ($hasMail == 0) { |