GEANT /
CAT
@@ -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 | $auth = new \web\lib\admin\Authentication(); |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $feds = $user->getAttributes("user:fedadmin"); |
| 71 | 71 | foreach ($feds as $oneFed) { |
| 72 | 72 | $theFed = new \core\Federation($oneFed['value']); |
| 73 | - printf("<h2>" . _("Certificate Information for %s %s")."</h2>", $uiElements->nomenclatureFed, $theFed->name); |
|
| 73 | + printf("<h2>"._("Certificate Information for %s %s")."</h2>", $uiElements->nomenclatureFed, $theFed->name); |
|
| 74 | 74 | foreach ($theFed->listTlsCertificates() as $oneCert) { |
| 75 | 75 | if ($oneCert['STATUS'] == "REQUESTED") { |
| 76 | 76 | $theFed->updateCertificateStatus($oneCert['REQSERIAL']); |
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | foreach ($theFed->listTlsCertificates() as $oneCert) { // fetch list a second time, in case we got a cert |
| 82 | 82 | $status = $oneCert['STATUS']; |
| 83 | 83 | echo "<tr>"; |
| 84 | - echo "<td>" . $oneCert['REQSERIAL'] . "</td><td>" . $oneCert['DN'] . "</td><td>" . $status . "</td><td>" . $oneCert['EXPIRY'] . "</td>"; |
|
| 84 | + echo "<td>".$oneCert['REQSERIAL']."</td><td>".$oneCert['DN']."</td><td>".$status."</td><td>".$oneCert['EXPIRY']."</td>"; |
|
| 85 | 85 | if ($status == "ISSUED") { |
| 86 | 86 | ?> |
| 87 | 87 | <td> |
| 88 | 88 | <form action='inc/showCert.inc.php' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8' method="POST"> |
| 89 | - <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT'];?>"/> |
|
| 90 | - <button type="submit"><?php echo _("Display");?></button> |
|
| 89 | + <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT']; ?>"/> |
|
| 90 | + <button type="submit"><?php echo _("Display"); ?></button> |
|
| 91 | 91 | </form> |
| 92 | 92 | <td> |
| 93 | 93 | <?php |
@@ -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 | $auth = new \web\lib\admin\Authentication(); |
| 14 | 14 | $auth->authenticate(); |
| 15 | 15 | $languageInstance = new \core\common\Language(); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | if ($editMode == 'fullaccess') { |
| 20 | 20 | $deployment = $validator->existingDeploymentManaged($_GET['deployment_id'], $inst); |
| 21 | 21 | $format = ''; |
| 22 | - if (isset($_GET['as']) && $_GET['as']=='csv') { |
|
| 22 | + if (isset($_GET['as']) && $_GET['as'] == 'csv') { |
|
| 23 | 23 | $format = 'csv'; |
| 24 | 24 | } |
| 25 | 25 | if (!isset($_POST['stats'])) { |
@@ -67,19 +67,19 @@ discard block |
||
| 67 | 67 | echo _("Protocol is a protocol used between a client and RADIUS server, for TLS it is a /-separated tuple TLS/TLS-Client-Cert-Serial"); |
| 68 | 68 | ?></p> |
| 69 | 69 | <table class='authrecord'> |
| 70 | - <caption><?php echo $tablecaption;?></caption> |
|
| 70 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 71 | 71 | <tr> |
| 72 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
| 73 | - <th scope="col"><strong><?php echo _("Outer-Identity");?></strong></th> |
|
| 74 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
| 75 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
| 76 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
| 77 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
| 78 | - <th scope="col"><strong><?php echo _("Protocol");?></strong></th> |
|
| 72 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
| 73 | + <th scope="col"><strong><?php echo _("Outer-Identity"); ?></strong></th> |
|
| 74 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
| 75 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
| 76 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
| 77 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
| 78 | + <th scope="col"><strong><?php echo _("Protocol"); ?></strong></th> |
|
| 79 | 79 | </tr> |
| 80 | 80 | <?php |
| 81 | 81 | foreach ($userAuthData as $oneRecord) { |
| 82 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
| 82 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
| 83 | 83 | . "<td>".$oneRecord['activity_time']."</td>" |
| 84 | 84 | // $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here |
| 85 | 85 | . "<td>".$oneRecord['outer_user']."</td>" |
@@ -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 | $auth = new \web\lib\admin\Authentication(); |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
| 33 | 33 | $validator = new \web\lib\common\InputValidation(); |
@@ -96,29 +96,29 @@ discard block |
||
| 96 | 96 | 'HINT' => _("See CSR generation rules below."), |
| 97 | 97 | ]; |
| 98 | 98 | $settings = array(); |
| 99 | - if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') { |
|
| 100 | - print '<h3 id="errorbox"><font color="red">'. $messages[$_SESSION['CSR_ERRORS']]; |
|
| 99 | + if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') { |
|
| 100 | + print '<h3 id="errorbox"><font color="red">'.$messages[$_SESSION['CSR_ERRORS']]; |
|
| 101 | 101 | if ($_SESSION['CSR_ERRORS'] == 'SOAP_ERROR' && isset($_SESSION['csr_faultcode'])) { |
| 102 | - print '<br>'. _('Reason') . ': '. $_SESSION['csr_faultcode']; |
|
| 102 | + print '<br>'._('Reason').': '.$_SESSION['csr_faultcode']; |
|
| 103 | 103 | unset($_SESSION['csr_faultcode']); |
| 104 | 104 | } else { |
| 105 | 105 | if ($_SESSION['CSR_ERRORS'] == 'WRONG_SUBJECT' && isset($_SESSION['csr_subject'])) { |
| 106 | - print '<br>'. _('Your subject is:') . ' '. $_SESSION['csr_subject']; |
|
| 106 | + print '<br>'._('Your subject is:').' '.$_SESSION['csr_subject']; |
|
| 107 | 107 | unset($_SESSION['csr_subject']); |
| 108 | 108 | } |
| 109 | - print '<br>' . $messages['HINT']; |
|
| 109 | + print '<br>'.$messages['HINT']; |
|
| 110 | 110 | } |
| 111 | 111 | print '</font></h3>'; |
| 112 | 112 | unset($_SESSION['CSR_ERRORS']); |
| 113 | 113 | } |
| 114 | - if (isset($_SESSION['FORM_SETTINGS']) && $_SESSION['FORM_SETTINGS'] != '') { |
|
| 114 | + if (isset($_SESSION['FORM_SETTINGS']) && $_SESSION['FORM_SETTINGS'] != '') { |
|
| 115 | 115 | $settings = $_SESSION['FORM_SETTINGS']; |
| 116 | 116 | unset($_SESSION['FORM_SETTINGS']); |
| 117 | 117 | } |
| 118 | 118 | if (empty($settings) && isset($_POST['LEVEL'])) { |
| 119 | 119 | $settings = array('LEVEL' => $_POST['LEVEL'], 'NRO-list' => $_POST['NRO-list'], 'INST-list' => $_POST['INST-list']); |
| 120 | 120 | } |
| 121 | - if ( isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) { |
|
| 121 | + if (isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) { |
|
| 122 | 122 | // basic sanity checks before we hand this over to openssl |
| 123 | 123 | $sanitisedCsr = $validator->string($_POST['CSR'] ?? "", TRUE); |
| 124 | 124 | |
@@ -139,14 +139,14 @@ discard block |
||
| 139 | 139 | $dn .= ', '; |
| 140 | 140 | } |
| 141 | 141 | if (is_array($subject[$sk])) { |
| 142 | - $dn .= $sk . '=' . implode(', ' . $sk . '=', $subject[$sk]); |
|
| 142 | + $dn .= $sk.'='.implode(', '.$sk.'=', $subject[$sk]); |
|
| 143 | 143 | } else { |
| 144 | - $dn .= $sk . '=' . $subject[$sk]; |
|
| 144 | + $dn .= $sk.'='.$subject[$sk]; |
|
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | if ($subject_keys[0] == 'DC' && $subject['DC']) { |
| 148 | 148 | foreach ($subject['DC'] as $v) { |
| 149 | - $dc[] = 'DC=' . $v; |
|
| 149 | + $dc[] = 'DC='.$v; |
|
| 150 | 150 | } |
| 151 | 151 | if ($DN !== array_reverse($dc)) { |
| 152 | 152 | $dc = array(); |
@@ -174,11 +174,11 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | $fed = $validator->existingFederation($_POST['NRO-list']); |
| 176 | 176 | $country = strtoupper($fed->tld); |
| 177 | - $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country ; |
|
| 177 | + $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country; |
|
| 178 | 178 | $DN[] = "C=$code"; |
| 179 | - $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[$country]['name']); |
|
| 179 | + $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[$country]['name']); |
|
| 180 | 180 | $serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld); |
| 181 | - $DN[] = "CN=" . $serverList[0]; |
|
| 181 | + $DN[] = "CN=".$serverList[0]; |
|
| 182 | 182 | $policies[] = "eduroam IdP"; |
| 183 | 183 | $policies[] = "eduroam SP"; |
| 184 | 184 | $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"]; |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | throw new Exception(sprintf("Sorry: you are not %s admin for the %s requested in the form.", $uiElements->nomenclatureFed, $uiElements->nomenclatureFed)); |
| 194 | 194 | } |
| 195 | 195 | $country = strtoupper($matches[1]); |
| 196 | - $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country ; |
|
| 196 | + $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country; |
|
| 197 | 197 | $DN[] = "C=$code"; |
| 198 | 198 | $serverInfo = $extInsts[$_POST['INST-list']]; |
| 199 | 199 | if (isset($serverInfo["names"]["en"])) { |
@@ -205,14 +205,14 @@ discard block |
||
| 205 | 205 | $modou = 1; |
| 206 | 206 | $ou = str_replace(",", "/,", $ou); |
| 207 | 207 | } |
| 208 | - $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 208 | + $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 209 | 209 | if (strlen($ou) >= 64) { |
| 210 | 210 | $ou = substr($ou, 0, 64); |
| 211 | 211 | $modou += 2; |
| 212 | 212 | } |
| 213 | 213 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 214 | 214 | $serverList = explode(",", $serverInfo["servers"]); |
| 215 | - $DN[] = "CN=" . $serverList[0]; |
|
| 215 | + $DN[] = "CN=".$serverList[0]; |
|
| 216 | 216 | switch ($serverInfo["type"]) { |
| 217 | 217 | case core\IdP::TYPE_IDPSP: |
| 218 | 218 | $policies[] = "eduroam IdP"; |
@@ -231,13 +231,13 @@ discard block |
||
| 231 | 231 | default: |
| 232 | 232 | throw new Exception("Sorry: Unknown level of issuance requested."); |
| 233 | 233 | } |
| 234 | - echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
|
| 234 | + echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties"); |
|
| 235 | 235 | echo "<ul>"; |
| 236 | - echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
|
| 237 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 236 | + echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>"; |
|
| 237 | + echo "<li>"._("Distinguished Name: ").implode(", ", $DN); |
|
| 238 | 238 | if ($modou > 0) { |
| 239 | 239 | echo " ("; |
| 240 | - echo _("Organization field adjusted"). ': '; |
|
| 240 | + echo _("Organization field adjusted").': '; |
|
| 241 | 241 | $desc = array(); |
| 242 | 242 | if ($modou >= 2) { |
| 243 | 243 | $desc[] = _("truncated to 64 chars"); |
@@ -249,8 +249,8 @@ discard block |
||
| 249 | 249 | echo ")"; |
| 250 | 250 | } |
| 251 | 251 | echo "</li>"; |
| 252 | - echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
|
| 253 | - echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
|
| 252 | + echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>"; |
|
| 253 | + echo "<li>"._("Requester Contact Details: ").$firstName." <".$firstMail.">"."</li>"; |
|
| 254 | 254 | echo "</ul></p>"; |
| 255 | 255 | $vettedCsr = $validator->string($_POST['CSR'], true); |
| 256 | 256 | $newCsrWithMeta = [ |
@@ -265,11 +265,11 @@ discard block |
||
| 265 | 265 | $loggerInstance->debug(2, $DN, "CERT DN: ", "\n"); |
| 266 | 266 | // our certs can be good for max 5 years |
| 267 | 267 | $fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays); |
| 268 | - echo "<p>" . _("The certificate was requested.") . "</p>"; |
|
| 268 | + echo "<p>"._("The certificate was requested.")."</p>"; |
|
| 269 | 269 | if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] == 'SOAP_ERROR') { |
| 270 | - print '<h3 id="errorbox"><font color="red">'. $messages[$_SESSION['CSR_ERRORS']]; |
|
| 270 | + print '<h3 id="errorbox"><font color="red">'.$messages[$_SESSION['CSR_ERRORS']]; |
|
| 271 | 271 | if (isset($_SESSION['csr_faultcode'])) { |
| 272 | - print '<br>'. _('Reason') . ': '. $_SESSION['csr_faultcode']; |
|
| 272 | + print '<br>'._('Reason').': '.$_SESSION['csr_faultcode']; |
|
| 273 | 273 | unset($_SESSION['csr_faultcode']); |
| 274 | 274 | } |
| 275 | 275 | unset($_SESSION['CSR_ERRORS']); |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | switch (count($feds)) { |
| 294 | 294 | case 0: |
| 295 | 295 | echo "<div>"; |
| 296 | - echo $uiElements->boxRemark("<strong>" . sprintf(_("None of your %s servers has complete information in the database."),$uiElements->nomenclatureFed)."</strong>" . _("At least the DNS names of TLS servers and a role-based contact mail address are required.")); |
|
| 296 | + echo $uiElements->boxRemark("<strong>".sprintf(_("None of your %s servers has complete information in the database."), $uiElements->nomenclatureFed)."</strong>"._("At least the DNS names of TLS servers and a role-based contact mail address are required.")); |
|
| 297 | 297 | echo "</div>"; |
| 298 | 298 | break; |
| 299 | 299 | case 1: |
@@ -301,22 +301,22 @@ discard block |
||
| 301 | 301 | if (empty($settings) || (isset($settings['LEVEL']) && $settings['LEVEL'] == 'NRO')) { |
| 302 | 302 | echo ' checked'; |
| 303 | 303 | } |
| 304 | - echo '>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 305 | - echo " <strong>" . $cat->knownFederations[$feds[0]->tld]['name'] . "</strong>"; |
|
| 306 | - echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>'; |
|
| 304 | + echo '>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 305 | + echo " <strong>".$cat->knownFederations[$feds[0]->tld]['name']."</strong>"; |
|
| 306 | + echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>'; |
|
| 307 | 307 | break; |
| 308 | 308 | default: |
| 309 | 309 | echo '<input type="radio" name="LEVEL" id="NRO" value="NRO"'; |
| 310 | 310 | if (empty($settings) || isset($settings['LEVEL']) && $settings['LEVEL'] == 'NRO') { |
| 311 | 311 | echo ' checked'; |
| 312 | 312 | } |
| 313 | - echo '>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 313 | + echo '>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 314 | 314 | ?> |
| 315 | 315 | <select name="NRO-list" id="NRO-list"> |
| 316 | 316 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 317 | 317 | <?php |
| 318 | 318 | foreach ($feds as $oneFed) { |
| 319 | - echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld]['name'] . "</option>"; |
|
| 319 | + echo '<option value="'.strtoupper($oneFed->tld).'">'.$cat->knownFederations[$oneFed->tld]['name']."</option>"; |
|
| 320 | 320 | #echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>"; |
| 321 | 321 | |
| 322 | 322 | } |
@@ -329,21 +329,21 @@ discard block |
||
| 329 | 329 | <script> |
| 330 | 330 | var instservers = []; |
| 331 | 331 | var instpolicies = []; |
| 332 | - var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo));?>'; |
|
| 332 | + var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?>'; |
|
| 333 | 333 | <?php |
| 334 | 334 | $allIdPs = []; |
| 335 | 335 | foreach ($allAuthorizedFeds as $oneFed) { |
| 336 | 336 | foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) { |
| 337 | - if (count($oneIdP['contacts']) ==0) { |
|
| 337 | + if (count($oneIdP['contacts']) == 0) { |
|
| 338 | 338 | continue; |
| 339 | 339 | } |
| 340 | - $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["name"]; |
|
| 341 | - echo "instservers['" . $id . "']='" . str_replace(",", ", ", $oneIdP["servers"]) . "';\n"; |
|
| 342 | - echo "instpolicies['" . $id . "']='"; |
|
| 340 | + $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["name"]; |
|
| 341 | + echo "instservers['".$id."']='".str_replace(",", ", ", $oneIdP["servers"])."';\n"; |
|
| 342 | + echo "instpolicies['".$id."']='"; |
|
| 343 | 343 | if ($oneIdP["type"] == 'IdPSP') { |
| 344 | 344 | echo "eduroam IdP/SP"; |
| 345 | 345 | } else { |
| 346 | - echo "eduroam " . $oneIdP["type"]; |
|
| 346 | + echo "eduroam ".$oneIdP["type"]; |
|
| 347 | 347 | } |
| 348 | 348 | echo "';\n"; |
| 349 | 349 | } |
@@ -391,9 +391,9 @@ discard block |
||
| 391 | 391 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 392 | 392 | <?php |
| 393 | 393 | foreach ($allIdPs as $id => $name) { |
| 394 | - echo '<option value="' . $id . '"'; |
|
| 394 | + echo '<option value="'.$id.'"'; |
|
| 395 | 395 | if (isset($settings['INST-list']) && $settings['INST-list'] == $id) { echo ' selected'; } |
| 396 | - echo '>' . $name . "</option>"; |
|
| 396 | + echo '>'.$name."</option>"; |
|
| 397 | 397 | } |
| 398 | 398 | ?> |
| 399 | 399 | </select> |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | <?php |
| 408 | 408 | echo _('According to the above settings you will receive') |
| 409 | 409 | ?> |
| 410 | - <span id='certlevel'><?php echo _('NRO level certificate');?></span> |
|
| 410 | + <span id='certlevel'><?php echo _('NRO level certificate'); ?></span> |
|
| 411 | 411 | |
| 412 | 412 | for server names: |
| 413 | 413 | <span id='serversinfo'><?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?></span> |
@@ -424,12 +424,12 @@ discard block |
||
| 424 | 424 | <?php |
| 425 | 425 | } else { |
| 426 | 426 | echo "<div>"; |
| 427 | - echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")),$uiElements->nomenclatureFed), "No TLS capable org!", true); |
|
| 427 | + echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")), $uiElements->nomenclatureFed), "No TLS capable org!", true); |
|
| 428 | 428 | echo "</div>"; |
| 429 | 429 | } |
| 430 | 430 | ?> |
| 431 | 431 | <?php |
| 432 | - echo '<div id="ondb"><h4 style="margin: 0">' . _("Can't you find an institution on the select list above?") . '</h4>'; |
|
| 432 | + echo '<div id="ondb"><h4 style="margin: 0">'._("Can't you find an institution on the select list above?").'</h4>'; |
|
| 433 | 433 | echo _("Most likely we do not have required data on this institution in the eduroam database."); |
| 434 | 434 | echo '<br/>'; |
| 435 | 435 | ?> |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | <?php |
| 438 | 438 | echo _('On this page'); |
| 439 | 439 | echo '</a> '; |
| 440 | - echo _('you can check what information is in the database') . '.'; |
|
| 440 | + echo _('you can check what information is in the database').'.'; |
|
| 441 | 441 | echo '</div>'; |
| 442 | 442 | if (count($feds) > 0 || count($allIdPs) > 0) {?> |
| 443 | 443 | <h2><?php echo _("2. CSR generation"); ?></h2> |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | echo '<br>'; |
| 448 | 448 | echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p> |
| 449 | 449 | <?php |
| 450 | - echo "<b>openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /". implode('/', array_reverse($DN)) ."/C=XY/O=WillBeReplaced/CN=will.be.replaced</b>"; |
|
| 450 | + echo "<b>openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /".implode('/', array_reverse($DN))."/C=XY/O=WillBeReplaced/CN=will.be.replaced</b>"; |
|
| 451 | 451 | ?> |
| 452 | 452 | <h2><?php echo _("3. Submission"); ?></h2> |
| 453 | 453 | <?php echo _("Please paste your CSR here:"); ?><br><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/> |
@@ -107,85 +107,85 @@ discard block |
||
| 107 | 107 | foreach ($optionsList as $option) { |
| 108 | 108 | $this->optionsHelp[$option] = $this->displayName($option, true); |
| 109 | 109 | } |
| 110 | - array_multisort(array_column($this->optionsHelp,'display'), SORT_ASC, $this->optionsHelp); |
|
| 110 | + array_multisort(array_column($this->optionsHelp, 'display'), SORT_ASC, $this->optionsHelp); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | public function setMessages() { |
| 114 | 114 | // FED general |
| 115 | - $h = "<p><h3>" . _("Here you set federation-level options.") . "</h3><p>"; |
|
| 116 | - $h .= "<i>" . _("The following options are available:") . "</i><p>"; |
|
| 115 | + $h = "<p><h3>"._("Here you set federation-level options.")."</h3><p>"; |
|
| 116 | + $h .= "<i>"._("The following options are available:")."</i><p>"; |
|
| 117 | 117 | if (isset($this->optionsHelp)) { |
| 118 | 118 | $h .= "<dl>"; |
| 119 | 119 | foreach ($this->optionsHelp as $o) { |
| 120 | - $h .= "<dt>". $o['display'] . "</dt>"; |
|
| 121 | - $h .= "<dd>" . $o['help'] . "</dd>"; |
|
| 120 | + $h .= "<dt>".$o['display']."</dt>"; |
|
| 121 | + $h .= "<dd>".$o['help']."</dd>"; |
|
| 122 | 122 | } |
| 123 | 123 | $h .= "</dl>"; |
| 124 | 124 | } |
| 125 | 125 | $this->helpMessage['fed_general'] = $h; |
| 126 | 126 | // SUPPORT |
| 127 | - $h = "<p>" . _("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.") . "</p>"; |
|
| 127 | + $h = "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>"; |
|
| 128 | 128 | if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") { |
| 129 | - $h .= "<p>" . |
|
| 130 | - sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $this->nomenclatureParticipant) . "</p>" . |
|
| 131 | - "<p>" . |
|
| 132 | - _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.") . "</p>"; |
|
| 129 | + $h .= "<p>". |
|
| 130 | + sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $this->nomenclatureParticipant)."</p>". |
|
| 131 | + "<p>". |
|
| 132 | + _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.")."</p>"; |
|
| 133 | 133 | if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") { |
| 134 | - $h .= "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), \config\ConfAssistant::SILVERBULLET['product_name']) . " " . _("This is the contact point for your organisation. It may be displayed publicly.") . "</p>"; |
|
| 134 | + $h .= "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), \config\ConfAssistant::SILVERBULLET['product_name'])." "._("This is the contact point for your organisation. It may be displayed publicly.")."</p>"; |
|
| 135 | 135 | } |
| 136 | 136 | } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") { |
| 137 | - $h .= "<p>" . _("Providing at least a local support e-mail contact is required.") . " " . _("This is the contact point for your end users' level 1 support.") . "</p>"; |
|
| 137 | + $h .= "<p>"._("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>"; |
|
| 138 | 138 | } |
| 139 | 139 | $this->helpMessage['support'] = $h; |
| 140 | 140 | |
| 141 | 141 | // MEDIA |
| 142 | - $h = "<p>" . |
|
| 143 | - sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p><ul>"; |
|
| 142 | + $h = "<p>". |
|
| 143 | + sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p><ul>"; |
|
| 144 | 144 | $h .= "<li>"; |
| 145 | - $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>"; |
|
| 145 | + $h .= "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>"; |
|
| 146 | 146 | if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) { |
| 147 | 147 | $ssidlist = ""; |
| 148 | 148 | foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) { |
| 149 | - $ssidlist .= ", '<strong>" . $ssid . "</strong>'"; |
|
| 149 | + $ssidlist .= ", '<strong>".$ssid."</strong>'"; |
|
| 150 | 150 | } |
| 151 | 151 | $ssidlist = substr($ssidlist, 2); |
| 152 | 152 | $h .= sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist); |
| 153 | - $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID")); |
|
| 153 | + $h .= "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID")); |
|
| 154 | 154 | } else { |
| 155 | - $h .= _("Please configure which SSIDs should be configured in the installers."); |
|
| 155 | + $h .= _("Please configure which SSIDs should be configured in the installers."); |
|
| 156 | 156 | } |
| 157 | - $h .= " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible."); |
|
| 157 | + $h .= " "._("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible."); |
|
| 158 | 158 | $h .= "</li>"; |
| 159 | 159 | |
| 160 | 160 | $h .= "<li>"; |
| 161 | - $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>"; |
|
| 161 | + $h .= "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>"; |
|
| 162 | 162 | if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) { |
| 163 | 163 | $consortiumlist = ""; |
| 164 | 164 | foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) { |
| 165 | - $consortiumlist .= ", '<strong>" . $oi . "</strong>'"; |
|
| 165 | + $consortiumlist .= ", '<strong>".$oi."</strong>'"; |
|
| 166 | 166 | } |
| 167 | 167 | $consortiumlist = substr($consortiumlist, 2); |
| 168 | 168 | $h .= sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'])), $consortiumlist); |
| 169 | 169 | |
| 170 | - $h .= "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $this->displayName("media:consortium_OI")); |
|
| 170 | + $h .= "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $this->displayName("media:consortium_OI")); |
|
| 171 | 171 | } else { |
| 172 | 172 | $h .= _("Please configure which Consortium OIs should be configured in the installers."); |
| 173 | 173 | } |
| 174 | 174 | $h .= "</li>"; |
| 175 | - $h .= "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>" |
|
| 176 | - . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") . |
|
| 175 | + $h .= "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>" |
|
| 176 | + . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail)."). |
|
| 177 | 177 | "</li>"; |
| 178 | - $h .= "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>" |
|
| 178 | + $h .= "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>" |
|
| 179 | 179 | . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.") |
| 180 | 180 | . "</li>"; |
| 181 | 181 | $h .= "</ul>"; |
| 182 | 182 | $this->helpMessage['media'] = $h; |
| 183 | 183 | |
| 184 | 184 | // IDP GENERAL |
| 185 | - $h = "<p>" . |
|
| 186 | - _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:") . "</p>". |
|
| 185 | + $h = "<p>". |
|
| 186 | + _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:")."</p>". |
|
| 187 | 187 | "<ul>". |
| 188 | - "<li>"._("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).") . "</li>". |
|
| 188 | + "<li>"._("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).")."</li>". |
|
| 189 | 189 | "<li>".sprintf(_("<strong>%s</strong>: The organisation may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $this->displayName("general:instname"))."</li>". |
| 190 | 190 | "<li>".sprintf(_("<strong>%s</strong>: This acronym will be used as an element of the installer file name instead of one automatically created from first letters of every word in the institution name. You may add acronyms for multiple languages (but only one per language). The acronym will also be used as a keyword for the organisation search on the user's downloads page."), $this->displayName("general:instshortname"))."</li>". |
| 191 | 191 | "<li>".sprintf(_("<strong>%s</strong>: You may add several versions of the organisation name or acronyms which will be used as additional keywords exclusively for the organisation search on the user's downloads page."), $this->displayName("general:instaltname"))."</li>". |
@@ -193,13 +193,13 @@ discard block |
||
| 193 | 193 | $this->helpMessage['idp_general'] = $h; |
| 194 | 194 | |
| 195 | 195 | // PROFILE GENERAL |
| 196 | - $h = "<p>" . _("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.") . "</p>". |
|
| 197 | - "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>". |
|
| 198 | - "<p>" . _("You can also tell us your RADIUS realm. "); |
|
| 196 | + $h = "<p>"._("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.")."</p>". |
|
| 197 | + "<p>"._("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.")."</p>". |
|
| 198 | + "<p>"._("You can also tell us your RADIUS realm. "); |
|
| 199 | 199 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) { |
| 200 | 200 | $h .= sprintf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 201 | 201 | } |
| 202 | - $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>"; |
|
| 202 | + $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).")."</p>"; |
|
| 203 | 203 | $this->helpMessage['profile'] = $h; |
| 204 | 204 | |
| 205 | 205 | // REALM |
@@ -209,24 +209,24 @@ discard block |
||
| 209 | 209 | $this->helpMessage['realm'] = $h; |
| 210 | 210 | |
| 211 | 211 | // REDIRECT |
| 212 | - $h ="<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>"; |
|
| 212 | + $h = "<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).")."</p>"; |
|
| 213 | 213 | $this->helpMessage['redirect'] = $h; |
| 214 | 214 | |
| 215 | 215 | // EAP |
| 216 | - $h = "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.") . "</p>"; |
|
| 216 | + $h = "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.")."</p>"; |
|
| 217 | 217 | $this->helpMessage['eap_support'] = $h; |
| 218 | 218 | |
| 219 | 219 | // LOCATIOM |
| 220 | - $h = "<p>" . |
|
| 221 | - _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.") . |
|
| 220 | + $h = "<p>". |
|
| 221 | + _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you."). |
|
| 222 | 222 | "</p> |
| 223 | 223 | <ul>" . |
| 224 | 224 | _("<li>Drag the marker in the map to your place, or</li> |
| 225 | 225 | <li>enter your street address in the field below for lookup, or</li> |
| 226 | -<li>use the 'Locate Me!' button</li>") . |
|
| 226 | +<li>use the 'Locate Me!' button</li>"). |
|
| 227 | 227 | "</ul> |
| 228 | 228 | <strong>" . |
| 229 | - _("We will use the coordinates as indicated by the marker for geolocation.") . |
|
| 229 | + _("We will use the coordinates as indicated by the marker for geolocation."). |
|
| 230 | 230 | "</strong>"; |
| 231 | 231 | $this->helpMessage['location'] = $h; |
| 232 | 232 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | <?php |
| 110 | 110 | foreach ($cat->printCountryList(1) as $country => $name) { |
| 111 | 111 | $selected = ''; |
| 112 | - if ($country == strtoupper($fed_id) ) { |
|
| 112 | + if ($country == strtoupper($fed_id)) { |
|
| 113 | 113 | $selected = 'selected'; |
| 114 | 114 | } |
| 115 | 115 | echo "<option value='$country' $selected>$name</option>\n"; |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | <?php |
| 343 | 343 | /// nomenclature for 'federation', federation name, nomenclature for 'inst' |
| 344 | 344 | echo "<tbody class='fedlist'>"; |
| 345 | - echo "<tr><td colspan='1'><strong>". _("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>"; |
|
| 345 | + echo "<tr><td colspan='1'><strong>"._("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>"; |
|
| 346 | 346 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='profilecheck' id='profile_ck_".$fedId."'></td>"; |
| 347 | 347 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='orcheck' id='or_ck_".$fedId."'></td>"; |
| 348 | 348 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='brokencert' id='brokencert_ck_".$fedId."'></td>"; |
@@ -459,14 +459,14 @@ discard block |
||
| 459 | 459 | <input type='hidden' name='inst' value='" |
| 460 | 460 | . $index."'>" |
| 461 | 461 | . "<span style='display:none' class='inst_name'>".$my_idp."</span>" |
| 462 | - . "<span>". $idp_instance->name."</span>" |
|
| 462 | + . "<span>".$idp_instance->name."</span>" |
|
| 463 | 463 | . " (<a href='overview_org.php?inst_id=" |
| 464 | 464 | . $idp_instance->identifier."'>" |
| 465 | 465 | . (in_array($index, $userIdps) ? _("manage") : _("view")) |
| 466 | 466 | . "</a>)" |
| 467 | - . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) |
|
| 467 | + . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>") |
|
| 468 | 468 | . implode("</li><li>", $listOfSilverbulletRealms) |
| 469 | - . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" ) |
|
| 469 | + . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>") |
|
| 470 | 470 | . "</td>"; |
| 471 | 471 | // deployment status; need to dive into profiles for this |
| 472 | 472 | // show happy eyeballs if at least one profile is configured/showtime |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | <?php |
| 97 | 97 | function copyIcon($target) { |
| 98 | - return '<img class="copy_link" id="'.$target.'" src="../resources/images/icons/Tabler/copy.svg" title="'. _("Copy to clipboard").'" >'; |
|
| 98 | + return '<img class="copy_link" id="'.$target.'" src="../resources/images/icons/Tabler/copy.svg" title="'._("Copy to clipboard").'" >'; |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * @param \core\DeploymentManaged $deploymentObject the deployment to work with |
| 105 | 105 | * @throws Exception |
| 106 | 106 | */ |
| 107 | -function displayDeploymentPropertyWidget(&$deploymentObject, $errormsg=[]) { |
|
| 107 | +function displayDeploymentPropertyWidget(&$deploymentObject, $errormsg = []) { |
|
| 108 | 108 | // RADIUS status icons |
| 109 | 109 | $depId = $deploymentObject->identifier; |
| 110 | 110 | $radiusMessages = [ |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $radius_status = array(); |
| 115 | 115 | $radius_status[0] = $deploymentObject->radius_status_1; |
| 116 | 116 | $radius_status[1] = $deploymentObject->radius_status_2; |
| 117 | - $cacert = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
| 117 | + $cacert = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
| 118 | 118 | $retry = $deploymentObject->checkRADIUSHostandConfigDaemon(); |
| 119 | 119 | $isradiusready = radius_ready($deploymentObject); |
| 120 | 120 | if (is_array($retry)) { |
@@ -126,11 +126,11 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | ?> |
| 128 | 128 | <div style='display: table-row_id;'> |
| 129 | - <div class='profilebox' id="profilebox_<?php echo $depId;?>" style='display: table-cell;'> |
|
| 129 | + <div class='profilebox' id="profilebox_<?php echo $depId; ?>" style='display: table-cell;'> |
|
| 130 | 130 | <h2><?php |
| 131 | 131 | switch ($deploymentObject->consortium) { |
| 132 | 132 | case "eduroam": |
| 133 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME. ": SP$depId-".$deploymentObject->institution; |
|
| 133 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME.": SP$depId-".$deploymentObject->institution; |
|
| 134 | 134 | break; |
| 135 | 135 | case "OpenRoaming": |
| 136 | 136 | $displayname = "OpenRoaming ANP"; |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | default: |
| 139 | 139 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
| 140 | 140 | } |
| 141 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
| 141 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
| 142 | 142 | ?></h2> |
| 143 | 143 | <table class="deployments"> |
| 144 | 144 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -171,9 +171,9 @@ discard block |
||
| 171 | 171 | <td> |
| 172 | 172 | <?php |
| 173 | 173 | if ($deploymentObject->status) { |
| 174 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 175 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 176 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>"; |
|
| 174 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 175 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 176 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>"; |
|
| 177 | 177 | } |
| 178 | 178 | ?> |
| 179 | 179 | </td> |
@@ -203,9 +203,9 @@ discard block |
||
| 203 | 203 | <td> |
| 204 | 204 | <?php |
| 205 | 205 | if ($deploymentObject->status && $deploymentObject->radius_status_2) { |
| 206 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 207 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 208 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>"; |
|
| 206 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 207 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 208 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>"; |
|
| 209 | 209 | } |
| 210 | 210 | ?> |
| 211 | 211 | </td> |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | <tr style="vertical-align:bottom"> |
| 214 | 214 | <td><?php echo _("RADIUS shared secret for both servers"); ?></td> |
| 215 | 215 | <td> |
| 216 | - <span id="shared_data_<?php echo $deploymentObject->identifier;?>"><?php echo $deploymentObject->secret;?></span> |
|
| 216 | + <span id="shared_data_<?php echo $deploymentObject->identifier; ?>"><?php echo $deploymentObject->secret; ?></span> |
|
| 217 | 217 | <?php echo copyIcon("shared_icon_".$deploymentObject->identifier) ?> |
| 218 | 218 | </td> |
| 219 | 219 | <td></td> |
@@ -249,9 +249,9 @@ discard block |
||
| 249 | 249 | <td> |
| 250 | 250 | <?php |
| 251 | 251 | if ($deploymentObject->status) { |
| 252 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 253 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 254 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>"; |
|
| 252 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 253 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 254 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>"; |
|
| 255 | 255 | } |
| 256 | 256 | ?> |
| 257 | 257 | </td> |
@@ -281,9 +281,9 @@ discard block |
||
| 281 | 281 | <td> |
| 282 | 282 | <?php |
| 283 | 283 | if ($deploymentObject->status && $deploymentObject->radius_status_2) { |
| 284 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 285 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 286 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>"; |
|
| 284 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 285 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 286 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>"; |
|
| 287 | 287 | } |
| 288 | 288 | ?> |
| 289 | 289 | </td> |
@@ -299,27 +299,27 @@ discard block |
||
| 299 | 299 | <td> |
| 300 | 300 | <?php |
| 301 | 301 | if ($deploymentObject->radsec_priv == '') { |
| 302 | - echo _('The client certificate was created using an uploaded CSR, the private key is not available') . '<br><br>'; |
|
| 302 | + echo _('The client certificate was created using an uploaded CSR, the private key is not available').'<br><br>'; |
|
| 303 | 303 | } |
| 304 | - echo _('Subject:') . ' ' . $data['name'] . '<br>'; |
|
| 305 | - echo _('Serial number:') . ' ' . $data['serialNumberHex'] . '<br>'; |
|
| 306 | - $dleft = floor(($data['validTo_time_t']-time())/(24*60*60)); |
|
| 304 | + echo _('Subject:').' '.$data['name'].'<br>'; |
|
| 305 | + echo _('Serial number:').' '.$data['serialNumberHex'].'<br>'; |
|
| 306 | + $dleft = floor(($data['validTo_time_t'] - time()) / (24 * 60 * 60)); |
|
| 307 | 307 | if ($dleft < 30) { |
| 308 | 308 | echo '<font color="red">'; |
| 309 | 309 | } |
| 310 | - echo _('Not valid after:') . ' '. date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s') . ' UTC'; |
|
| 310 | + echo _('Not valid after:').' '.date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s').' UTC'; |
|
| 311 | 311 | if ($dleft > 2) { |
| 312 | - echo '<br>' . _('Number of days to expiry:') . ' ' . $dleft; |
|
| 312 | + echo '<br>'._('Number of days to expiry:').' '.$dleft; |
|
| 313 | 313 | } else { |
| 314 | - echo '<br>' . _('If you are using RADIUS over TLS you should urgently renew your credentials') . '!'; |
|
| 314 | + echo '<br>'._('If you are using RADIUS over TLS you should urgently renew your credentials').'!'; |
|
| 315 | 315 | } |
| 316 | 316 | if ($dleft < 30) { echo '</font>'; } |
| 317 | 317 | ?></td> |
| 318 | 318 | </tr><tr><td></td> |
| 319 | 319 | |
| 320 | 320 | <td> |
| 321 | - <span style="display: none;" id="cert_data_<?php echo $depId;?>"><?php echo $deploymentObject->radsec_cert;?></span> |
|
| 322 | - <span style="display: none;" id="ca_cert_data_<?php echo $depId;?>"><?php echo $cacert;?></span> |
|
| 321 | + <span style="display: none;" id="cert_data_<?php echo $depId; ?>"><?php echo $deploymentObject->radsec_cert; ?></span> |
|
| 322 | + <span style="display: none;" id="ca_cert_data_<?php echo $depId; ?>"><?php echo $cacert; ?></span> |
|
| 323 | 323 | <?php if ($deploymentObject->radsec_priv != '') { |
| 324 | 324 | echo _("private key").copyIcon("priv_key_icon_$depId")." "; |
| 325 | 325 | echo '<span style="display: none;" id="priv_key_data_'.$depId.'">'.$deploymentObject->radsec_priv.'</span>'; |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | echo _("CA certificate").copyIcon("ca_cert_icon_$depId"); |
| 331 | 331 | ?> |
| 332 | 332 | <br/> |
| 333 | - <button name="sendzip" onclick="location.href='inc/sendZip.inc.php?inst_id=<?php echo $deploymentObject->institution;?>&dep_id=<?php echo $depId?>'" type="button"><?php echo _('download ZIP-file with full data');?></button> |
|
| 333 | + <button name="sendzip" onclick="location.href='inc/sendZip.inc.php?inst_id=<?php echo $deploymentObject->institution; ?>&dep_id=<?php echo $depId?>'" type="button"><?php echo _('download ZIP-file with full data'); ?></button> |
|
| 334 | 334 | |
| 335 | 335 | </td> |
| 336 | 336 | <td></td> |
@@ -341,10 +341,10 @@ discard block |
||
| 341 | 341 | <?php |
| 342 | 342 | if ($deploymentObject->radsec_cert != NULL) { |
| 343 | 343 | echo "<i>"; |
| 344 | - echo _('If your certificate is close to expiry or you need to create new RADIUS over TLS credentials') . '<br>' . |
|
| 345 | - _('click on "Renew RADIUS over TLS credentials" button') . '<br>'; |
|
| 344 | + echo _('If your certificate is close to expiry or you need to create new RADIUS over TLS credentials').'<br>'. |
|
| 345 | + _('click on "Renew RADIUS over TLS credentials" button').'<br>'; |
|
| 346 | 346 | |
| 347 | - echo '<br/>' . _('You can upload your own CSR to replace default TLS credentials.') . '<br>' . |
|
| 347 | + echo '<br/>'._('You can upload your own CSR to replace default TLS credentials.').'<br>'. |
|
| 348 | 348 | _('Click on "Upload CSR to sign my own TLS credentials"'); |
| 349 | 349 | echo "</i>"; |
| 350 | 350 | } |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | ?> |
| 381 | 381 | <tr></tr> |
| 382 | - <tr><th colspan="2"><?php echo _('Additional deployment settings');?></th></tr> |
|
| 382 | + <tr><th colspan="2"><?php echo _('Additional deployment settings'); ?></th></tr> |
|
| 383 | 383 | <tr> |
| 384 | 384 | <td> |
| 385 | 385 | <?php |
@@ -459,12 +459,12 @@ discard block |
||
| 459 | 459 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
| 460 | 460 | echo '<br>'; |
| 461 | 461 | if ($res['FAILURE'] == 2) { |
| 462 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
| 462 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
| 463 | 463 | } else { |
| 464 | 464 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 465 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
| 465 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
| 466 | 466 | } else { |
| 467 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
| 467 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
| 468 | 468 | } |
| 469 | 469 | } |
| 470 | 470 | } |
@@ -491,12 +491,12 @@ discard block |
||
| 491 | 491 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
| 492 | 492 | echo '<br>'; |
| 493 | 493 | if ($res['FAILURE'] == 2) { |
| 494 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
| 494 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
| 495 | 495 | } else { |
| 496 | 496 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 497 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
| 497 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
| 498 | 498 | } else { |
| 499 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
| 499 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
| 500 | 500 | } |
| 501 | 501 | } |
| 502 | 502 | } |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | </div> |
| 545 | 545 | <?php |
| 546 | 546 | if (!$isradiusready) { |
| 547 | - echo '<p>'. _("We are not able to handle a new configuration request requiring contact with RADIUS servers now.") . '<br>' . _("Check later."); |
|
| 547 | + echo '<p>'._("We are not able to handle a new configuration request requiring contact with RADIUS servers now.").'<br>'._("Check later."); |
|
| 548 | 548 | |
| 549 | 549 | } |
| 550 | 550 | if (count($errormsg) > 0 && array_key_exists($deploymentObject->identifier, $errormsg)) { |
@@ -560,38 +560,38 @@ discard block |
||
| 560 | 560 | </div> |
| 561 | 561 | <div style='width:20px;'></div> <!-- QR code space, reserved --> |
| 562 | 562 | <div style='display: table-cell; min-width:200px;'> |
| 563 | - <?php $tablecaption = _("Hotspot Usage Statistics");?> |
|
| 563 | + <?php $tablecaption = _("Hotspot Usage Statistics"); ?> |
|
| 564 | 564 | <h1><?php echo $tablecaption; ?></h1> |
| 565 | - <h2><?php echo _("5 most recent authentications");?></h2> |
|
| 566 | - <p><?php echo _("<b>AP Identifier</b> is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id") .'<br>'; |
|
| 565 | + <h2><?php echo _("5 most recent authentications"); ?></h2> |
|
| 566 | + <p><?php echo _("<b>AP Identifier</b> is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id").'<br>'; |
|
| 567 | 567 | echo _("<b>Protocol</b> is a protocol used between a client and RADIUS server, for TLS it is a /-separated tuple TLS/<i>TLS-Client-Cert-Serial</i>"); ?></p> |
| 568 | 568 | <table class='authrecord'> |
| 569 | - <caption><?php echo $tablecaption;?></caption> |
|
| 569 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 570 | 570 | <tr style='text-align: left;'> |
| 571 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
| 572 | - <th scope="col"><strong><?php echo _("Outer-Identity");?></strong></th> |
|
| 573 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
| 574 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
| 575 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
| 576 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
| 577 | - <th scope="col"><strong><?php echo _("Protocol");?></strong></th> |
|
| 571 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
| 572 | + <th scope="col"><strong><?php echo _("Outer-Identity"); ?></strong></th> |
|
| 573 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
| 574 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
| 575 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
| 576 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
| 577 | + <th scope="col"><strong><?php echo _("Protocol"); ?></strong></th> |
|
| 578 | 578 | </tr> |
| 579 | 579 | <?php |
| 580 | - $userAuthData = $deploymentObject->retrieveStatistics(0,5); |
|
| 580 | + $userAuthData = $deploymentObject->retrieveStatistics(0, 5); |
|
| 581 | 581 | $i = 0; |
| 582 | 582 | foreach ($userAuthData as $oneRecord) { |
| 583 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
| 583 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
| 584 | 584 | . "<td>".$oneRecord['activity_time']."</td>" |
| 585 | 585 | . "<td>".$oneRecord['outer_user']."</td>" |
| 586 | 586 | . "<td>".($oneRecord['result'] == "OK" ? _("Success") : _("Failure"))."</td>" |
| 587 | 587 | . "<td>".$oneRecord['mac']."</td>" |
| 588 | 588 | . "<td>".substr($oneRecord['cui'], 0, 18) |
| 589 | - . ($oneRecord['cui']=='' ? "" : "... " . copyIcon("cui_icon_".$deploymentObject->identifier."_$i") |
|
| 589 | + . ($oneRecord['cui'] == '' ? "" : "... ".copyIcon("cui_icon_".$deploymentObject->identifier."_$i") |
|
| 590 | 590 | . "<span style='display: none;' id='cui_data_".$deploymentObject->identifier."_$i'>".$oneRecord['cui'].'</span>')."</td>" |
| 591 | 591 | . "<td>".$oneRecord['ap_id']."</td>" |
| 592 | 592 | . "<td>".$oneRecord['prot']."</td>" |
| 593 | 593 | . "</tr>"; |
| 594 | - if ($oneRecord['cui']!='') { |
|
| 594 | + if ($oneRecord['cui'] != '') { |
|
| 595 | 595 | $i++; |
| 596 | 596 | } |
| 597 | 597 | } |
@@ -613,11 +613,11 @@ discard block |
||
| 613 | 613 | echo _('Get statistics as CSV file:').' '; |
| 614 | 614 | $query = 'inc/deploymentStats.inc.php?inst_id='.$deploymentObject->institution."&deployment_id=$depId&as=csv&backlog="; |
| 615 | 615 | ?> |
| 616 | - <button name="sendcsv" type="button" onclick="location.href='<?php echo $query;?>WEEK';"><?php echo _('Last week');?> |
|
| 616 | + <button name="sendcsv" type="button" onclick="location.href='<?php echo $query; ?>WEEK';"><?php echo _('Last week'); ?> |
|
| 617 | 617 | </button> |
| 618 | - <button name="sendcsv" type="button" onclick="location.href='<?php echo $query;?>MONTH';"><?php echo _('Last 30 days');?> |
|
| 618 | + <button name="sendcsv" type="button" onclick="location.href='<?php echo $query; ?>MONTH';"><?php echo _('Last 30 days'); ?> |
|
| 619 | 619 | </button> |
| 620 | - <button name="sendcsv" type="button" onclick="location.href='<?php echo $query;?>FULL';"><?php echo _('Last 6 months');?> |
|
| 620 | + <button name="sendcsv" type="button" onclick="location.href='<?php echo $query; ?>FULL';"><?php echo _('Last 6 months'); ?> |
|
| 621 | 621 | </button> |
| 622 | 622 | </div><!-- statistics space --> |
| 623 | 623 | <div style='height:5px'></div> |
@@ -626,14 +626,14 @@ discard block |
||
| 626 | 626 | <h2><?php echo _('To get detailed logs from RADIUS sites click a button below.'); |
| 627 | 627 | $query = 'inc/deploymentLogs.inc.php?inst_id='.$deploymentObject->institution."&deployment_id=$depId&backlog="; |
| 628 | 628 | ?></h2> |
| 629 | - <?php echo _('You will receive zip file with logs from both RADIUS servers: primary (folder named radius-1) and secondary (folder named radius-2).') . '<br>' . |
|
| 630 | - _('If no logs are available an empty zip file is provided.');?> |
|
| 629 | + <?php echo _('You will receive zip file with logs from both RADIUS servers: primary (folder named radius-1) and secondary (folder named radius-2).').'<br>'. |
|
| 630 | + _('If no logs are available an empty zip file is provided.'); ?> |
|
| 631 | 631 | <div style='height:3px'></div> |
| 632 | - <button name="logs" type="button" onclick="location.href='<?php echo $query;?>1';"><?php echo _('Today');?> |
|
| 632 | + <button name="logs" type="button" onclick="location.href='<?php echo $query; ?>1';"><?php echo _('Today'); ?> |
|
| 633 | 633 | </button> |
| 634 | - <button name="logs" type="button" onclick="location.href='<?php echo $query;?>2';"><?php echo _('Last 2 days');?> |
|
| 634 | + <button name="logs" type="button" onclick="location.href='<?php echo $query; ?>2';"><?php echo _('Last 2 days'); ?> |
|
| 635 | 635 | </button> |
| 636 | - <button name="logs" type="button" onclick="location.href='<?php echo $query;?>7';"><?php echo _('Last 7 days');?> |
|
| 636 | + <button name="logs" type="button" onclick="location.href='<?php echo $query; ?>7';"><?php echo _('Last 7 days'); ?> |
|
| 637 | 637 | </button> |
| 638 | 638 | </div> |
| 639 | 639 | </div> |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | <div> |
| 682 | 682 | <input type="hidden" name="consortium" value="eduroam"/> |
| 683 | 683 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
| 684 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 684 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 685 | 685 | </button> |
| 686 | 686 | <span style='color: red;'> |
| 687 | 687 | <?php if ($hasMail == 0) { |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id; |
| 338 | 338 | } |
| 339 | 339 | if ($clients > $maxSupportedClients * 0.9) { |
| 340 | - $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!"); |
|
| 340 | + $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!"); |
|
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | if (count($serverCandidates) == 0 && $federation != "DEFAULT") { |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | * |
| 360 | 360 | * @throws Exception |
| 361 | 361 | */ |
| 362 | - private function setTLSSerialNumber($max=PHP_INT_MAX) { |
|
| 362 | + private function setTLSSerialNumber($max = PHP_INT_MAX) { |
|
| 363 | 363 | $nonDupSerialFound = FALSE; |
| 364 | 364 | do { |
| 365 | 365 | $serial = random_int(1000000000, $max); |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | */ |
| 380 | 380 | private function createTLScredentials() |
| 381 | 381 | { |
| 382 | - $clientName = 'SP' . $this->identifier . '-' . $this->institution; |
|
| 382 | + $clientName = 'SP'.$this->identifier.'-'.$this->institution; |
|
| 383 | 383 | $dn = array( |
| 384 | 384 | "organizationName" => "eduroam", |
| 385 | 385 | "organizationalUnitName" => "eduroam Managed SP", |
@@ -393,14 +393,14 @@ discard block |
||
| 393 | 393 | openssl_pkey_export($privkey, $this->radsec_priv); |
| 394 | 394 | // Generate a certificate signing request |
| 395 | 395 | $csr = openssl_csr_new($dn, $privkey, |
| 396 | - array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf")); |
|
| 396 | + array('digest_alg' => 'sha256', 'config' => ROOT."/config/ManagedSPCerts/openssl.cnf")); |
|
| 397 | 397 | // get CA certificate and private key |
| 398 | - $caprivkey = array(file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key"), |
|
| 398 | + $caprivkey = array(file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.key"), |
|
| 399 | 399 | \config\Master::MANAGEDSP['capass']); |
| 400 | - $cacert = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
| 400 | + $cacert = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
| 401 | 401 | $this->setTLSSerialNumber(); |
| 402 | 402 | $clientcert = openssl_csr_sign($csr, $cacert, $caprivkey, \config\Master::MANAGEDSP['daystoexpiry'], |
| 403 | - array('digest_alg'=>'sha512', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no); |
|
| 403 | + array('digest_alg'=>'sha512', 'config' => ROOT."/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no); |
|
| 404 | 404 | openssl_x509_export($clientcert, $this->radsec_cert); |
| 405 | 405 | } |
| 406 | 406 | /** |
@@ -425,8 +425,8 @@ discard block |
||
| 425 | 425 | $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND )"; |
| 426 | 426 | $conditional2 = "DESC"; |
| 427 | 427 | } |
| 428 | - $client = 'SP' . $this->identifier . '-' . $this->institution; |
|
| 429 | - $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id, prot, outer_user FROM activity WHERE owner = ? $conditional1 ORDER BY activity_time $conditional2", "s", $client ); |
|
| 428 | + $client = 'SP'.$this->identifier.'-'.$this->institution; |
|
| 429 | + $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id, prot, outer_user FROM activity WHERE owner = ? $conditional1 ORDER BY activity_time $conditional2", "s", $client); |
|
| 430 | 430 | |
| 431 | 431 | return mysqli_fetch_all($stats, \MYSQLI_ASSOC); |
| 432 | 432 | } |
@@ -544,11 +544,11 @@ discard block |
||
| 544 | 544 | $dn['rdnSequence'][1][0]['value']['utf8String'] = 'eduroam Managed SP'; |
| 545 | 545 | $dn['rdnSequence'][2] = array(); |
| 546 | 546 | $dn['rdnSequence'][2][] = array('type' => 'id-at-commonName', 'value' => array()); |
| 547 | - $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP' . $this->identifier . "-" . $this->institution; |
|
| 547 | + $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP'.$this->identifier."-".$this->institution; |
|
| 548 | 548 | $csr->setDN($dn); |
| 549 | - $pemcakey = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key"); |
|
| 550 | - $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass'] ); |
|
| 551 | - $pemca = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
| 549 | + $pemcakey = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.key"); |
|
| 550 | + $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass']); |
|
| 551 | + $pemca = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.pem"); |
|
| 552 | 552 | $ca = new \phpseclib3\File\X509(); |
| 553 | 553 | $ca->loadX509($pemca); |
| 554 | 554 | $ca->setPrivateKey($cakey); |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | $csr->setExtension('id-ce-keyUsage', ['digitalSignature', 'nonRepudiation', 'keyEncipherment']); |
| 558 | 558 | $csr->setExtension('id-ce-extKeyUsage', ['id-kp-clientAuth']); |
| 559 | 559 | $csr->setExtension('id-ce-basicConstraints', ['cA' => false], false); |
| 560 | - $x509->setEndDate('+' . \config\Master::MANAGEDSP['daystoexpiry'] . ' days'); |
|
| 560 | + $x509->setEndDate('+'.\config\Master::MANAGEDSP['daystoexpiry'].' days'); |
|
| 561 | 561 | $this->setTLSSerialNumber(999999999999999999); |
| 562 | 562 | $x509->setSerialNumber($this->radsec_cert_serial_no, 10); |
| 563 | 563 | $cert = $x509->loadX509($x509->saveX509($x509->sign($ca, $csr))); |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | { |
| 600 | 600 | $customAttrib = $this->getAttributes("managedsp:operatorname"); |
| 601 | 601 | if (count($customAttrib) == 0) { |
| 602 | - return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
| 602 | + return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
| 603 | 603 | } |
| 604 | 604 | return $customAttrib[0]["value"]; |
| 605 | 605 | } |
@@ -614,24 +614,24 @@ discard block |
||
| 614 | 614 | private function sendToRADIUS(int $idx, $post) |
| 615 | 615 | { |
| 616 | 616 | $hostname = "radius_hostname_$idx"; |
| 617 | - $p = "server$idx" . "_secret"; |
|
| 617 | + $p = "server$idx"."_secret"; |
|
| 618 | 618 | $key = $this->$p; |
| 619 | - $p = "server$idx" . "_iv"; |
|
| 619 | + $p = "server$idx"."_iv"; |
|
| 620 | 620 | $iv = $this->$p; |
| 621 | - $p = "server$idx" . "_token"; |
|
| 621 | + $p = "server$idx"."_token"; |
|
| 622 | 622 | $token = $this->$p; |
| 623 | - $encrypted = openssl_encrypt($post . "&token=$token", "CHACHA20", $key, 0, $iv); |
|
| 623 | + $encrypted = openssl_encrypt($post."&token=$token", "CHACHA20", $key, 0, $iv); |
|
| 624 | 624 | if ($encrypted !== false) { |
| 625 | - $post = "enc=". urlencode(base64_encode($encrypted)); |
|
| 625 | + $post = "enc=".urlencode(base64_encode($encrypted)); |
|
| 626 | 626 | } |
| 627 | - $ch = curl_init("http://" . $this->$hostname . ':' . \config\Master::MANAGEDSP['radiusconfigport']); |
|
| 627 | + $ch = curl_init("http://".$this->$hostname.':'.\config\Master::MANAGEDSP['radiusconfigport']); |
|
| 628 | 628 | if ($ch === FALSE) { |
| 629 | 629 | $res = 'FAILURE'; |
| 630 | 630 | } else { |
| 631 | 631 | curl_setopt($ch, CURLOPT_USERAGENT, "CAT-ManagedSP"); |
| 632 | 632 | curl_setopt($ch, CURLOPT_POST, 1); |
| 633 | 633 | curl_setopt($ch, CURLOPT_POSTFIELDS, $post); |
| 634 | - $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ':' . \config\Master::MANAGEDSP['radiusconfigport'] . "/$post\n"); |
|
| 634 | + $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.':'.\config\Master::MANAGEDSP['radiusconfigport']."/$post\n"); |
|
| 635 | 635 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); |
| 636 | 636 | curl_setopt($ch, CURLOPT_HEADER, 0); |
| 637 | 637 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
@@ -671,19 +671,19 @@ discard block |
||
| 671 | 671 | } else { |
| 672 | 672 | $txt = $remove ? _('Profile deactivation failed') : _('Profile activation/modification failed'); |
| 673 | 673 | } |
| 674 | - $txt = $txt . ' '; |
|
| 674 | + $txt = $txt.' '; |
|
| 675 | 675 | if (array_count_values($response)[$status] == 2) { |
| 676 | - $txt = $txt . _('on both RADIUS servers: primary and backup') . '.'; |
|
| 676 | + $txt = $txt._('on both RADIUS servers: primary and backup').'.'; |
|
| 677 | 677 | } else { |
| 678 | 678 | if ($response['res[1]'] == $status) { |
| 679 | - $txt = $txt . _('on primary RADIUS server') . '.'; |
|
| 679 | + $txt = $txt._('on primary RADIUS server').'.'; |
|
| 680 | 680 | } else { |
| 681 | - $txt = $txt . _('on backup RADIUS server') . '.'; |
|
| 681 | + $txt = $txt._('on backup RADIUS server').'.'; |
|
| 682 | 682 | } |
| 683 | 683 | } |
| 684 | 684 | $mail = \core\common\OutsideComm::mailHandle(); |
| 685 | 685 | $email = $this->getAttributes("support:email")[0]['value']; |
| 686 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System"; |
|
| 686 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System"; |
|
| 687 | 687 | $mail->addAddress($email); |
| 688 | 688 | if ($status == 'OK') { |
| 689 | 689 | $mail->Subject = _('RADIUS profile update problem fixed'); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | return NULL; |
| 718 | 718 | } |
| 719 | 719 | $timeout = 10; |
| 720 | - curl_setopt($ch, CURLOPT_URL, 'http://' . $host); |
|
| 720 | + curl_setopt($ch, CURLOPT_URL, 'http://'.$host); |
|
| 721 | 721 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
| 722 | 722 | curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
| 723 | 723 | curl_exec($ch); |
@@ -811,52 +811,52 @@ discard block |
||
| 811 | 811 | { |
| 812 | 812 | $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => '')); |
| 813 | 813 | if ($torevoke != '') { |
| 814 | - $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . |
|
| 814 | + $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier. |
|
| 815 | 815 | "&torevoke=$torevoke"; |
| 816 | 816 | foreach (array_keys($toPost) as $key) { |
| 817 | 817 | $toPost[$key] = $toPostTemplate; |
| 818 | 818 | } |
| 819 | 819 | } else { |
| 820 | 820 | $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1; |
| 821 | - $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . |
|
| 822 | - '&secret=' . $this->secret . |
|
| 823 | - '&country=' . $this->getAttributes("internal:country")[0]['value'] . |
|
| 824 | - '&pskkey=' . $this->pskkey . '&'; |
|
| 821 | + $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier. |
|
| 822 | + '&secret='.$this->secret. |
|
| 823 | + '&country='.$this->getAttributes("internal:country")[0]['value']. |
|
| 824 | + '&pskkey='.$this->pskkey.'&'; |
|
| 825 | 825 | if ($remove) { |
| 826 | - $toPostTemplate = $toPostTemplate . 'remove=1&'; |
|
| 826 | + $toPostTemplate = $toPostTemplate.'remove=1&'; |
|
| 827 | 827 | } else { |
| 828 | - $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getOperatorName() . '&'; |
|
| 828 | + $toPostTemplate = $toPostTemplate.'operatorname='.$this->getOperatorName().'&'; |
|
| 829 | 829 | if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) { |
| 830 | 830 | $allRealms = $this->getAllRealms(); |
| 831 | 831 | if (!empty($allRealms)) { |
| 832 | - $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&'; |
|
| 833 | - $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&'; |
|
| 832 | + $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&'; |
|
| 833 | + $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&'; |
|
| 834 | 834 | } |
| 835 | 835 | } |
| 836 | 836 | if ($this->getAttributes("managedsp:guest_vlan")[0]['value'] ?? NULL) { |
| 837 | - $toPostTemplate = $toPostTemplate . 'guest_vlan=' . $this->getAttributes("managedsp:guest_vlan")[0]['value'] . '&'; |
|
| 837 | + $toPostTemplate = $toPostTemplate.'guest_vlan='.$this->getAttributes("managedsp:guest_vlan")[0]['value'].'&'; |
|
| 838 | 838 | } |
| 839 | 839 | } |
| 840 | 840 | foreach (array_keys($toPost) as $key) { |
| 841 | - $elem = 'port' . $key; |
|
| 842 | - $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem; |
|
| 841 | + $elem = 'port'.$key; |
|
| 842 | + $toPost[$key] = $toPostTemplate.'port='.$this->$elem; |
|
| 843 | 843 | } |
| 844 | 844 | } |
| 845 | 845 | $response = array(); |
| 846 | 846 | foreach ($toPost as $key => $value) { |
| 847 | - $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n"); |
|
| 847 | + $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n"); |
|
| 848 | 848 | // temporarly one server $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); |
| 849 | 849 | if ($key == 2) { |
| 850 | 850 | $response['res[2]'] = 'OK'; |
| 851 | 851 | } else { |
| 852 | - $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 852 | + $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 853 | 853 | } |
| 854 | 854 | } |
| 855 | 855 | if ($onlyone) { |
| 856 | - $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK; |
|
| 856 | + $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK; |
|
| 857 | 857 | } |
| 858 | 858 | foreach (array('OK', 'FAILURE') as $status) { |
| 859 | - if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) { |
|
| 859 | + if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) { |
|
| 860 | 860 | $this->sendMailtoAdmin($remove, $response, $status); |
| 861 | 861 | } |
| 862 | 862 | } |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | $randomiv = ""; |
| 876 | 876 | if ($logs) { |
| 877 | 877 | $randomiv = bin2hex(random_bytes(8)); |
| 878 | - $toPostTemplate = 'logid=DEBUG-' . $this->identifier . '-' .$this->institution . "&backlog=$logs&iv=$randomiv"; |
|
| 878 | + $toPostTemplate = 'logid=DEBUG-'.$this->identifier.'-'.$this->institution."&backlog=$logs&iv=$randomiv"; |
|
| 879 | 879 | foreach (array_keys($toPost) as $key) { |
| 880 | 880 | $toPost[$key] = $toPostTemplate; |
| 881 | 881 | } |
@@ -884,21 +884,21 @@ discard block |
||
| 884 | 884 | $tempdir = \core\common\Entity::createTemporaryDirectory("test"); |
| 885 | 885 | $zipdir = $tempdir['dir']; |
| 886 | 886 | foreach ($toPost as $key => $value) { |
| 887 | - $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n"); |
|
| 888 | - $p = "server$key" . "_secret"; |
|
| 887 | + $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n"); |
|
| 888 | + $p = "server$key"."_secret"; |
|
| 889 | 889 | $secret = $this->$p; |
| 890 | - $p = "server$key" . "_token"; |
|
| 890 | + $p = "server$key"."_token"; |
|
| 891 | 891 | $token = $this->$p; |
| 892 | - $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 892 | + $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 893 | 893 | $paths = []; |
| 894 | - if (substr($response['res[' . $key . ']'], 0, 8) == 'ZIPDATA:' && $randomiv != '') { |
|
| 895 | - $encrypted = substr($response['res[' . $key . ']'], 8); |
|
| 894 | + if (substr($response['res['.$key.']'], 0, 8) == 'ZIPDATA:' && $randomiv != '') { |
|
| 895 | + $encrypted = substr($response['res['.$key.']'], 8); |
|
| 896 | 896 | $data = openssl_decrypt($encrypted, "CHACHA20", $secret, 0, $randomiv); |
| 897 | 897 | if ($data !== false && substr($data, 0, strlen($token)) == $token) { |
| 898 | 898 | $data = substr($data, strlen($token)); |
| 899 | 899 | } |
| 900 | 900 | if (!file_exists("$zipdir/$key")) { |
| 901 | - mkdir("$zipdir/$key", 0755, true ); |
|
| 901 | + mkdir("$zipdir/$key", 0755, true); |
|
| 902 | 902 | } |
| 903 | 903 | $fileHandle = fopen("$zipdir/$key/detail.zip", "wb"); |
| 904 | 904 | fwrite($fileHandle, $data); |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | } |
| 907 | 907 | } |
| 908 | 908 | $zipt = new \ZipArchive; |
| 909 | - $zipt->open("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip', \ZipArchive::CREATE); |
|
| 909 | + $zipt->open("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip', \ZipArchive::CREATE); |
|
| 910 | 910 | $cnt = 0; |
| 911 | 911 | foreach ($toPost as $key => $value) { |
| 912 | 912 | if (file_exists("$zipdir/$key/detail.zip")) { |
@@ -918,7 +918,7 @@ discard block |
||
| 918 | 918 | $zipf->close(); |
| 919 | 919 | unlink("$zipdir/$key/detail.zip"); |
| 920 | 920 | $files = scandir("$zipdir/$key/"); |
| 921 | - foreach($files as $file) { |
|
| 921 | + foreach ($files as $file) { |
|
| 922 | 922 | if ($file == '.' || $file == '..') continue; |
| 923 | 923 | $data = file_get_contents("$zipdir/$key/$file"); |
| 924 | 924 | $zipt->addFromString("radius-$key/$file", $data); |
@@ -934,14 +934,14 @@ discard block |
||
| 934 | 934 | $zipt->addEmptyDir('.'); |
| 935 | 935 | } |
| 936 | 936 | $zipt->close(); |
| 937 | - if (file_exists("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip')) { |
|
| 938 | - $data = file_get_contents("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip'); |
|
| 939 | - unlink("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip'); |
|
| 937 | + if (file_exists("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip')) { |
|
| 938 | + $data = file_get_contents("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip'); |
|
| 939 | + unlink("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip'); |
|
| 940 | 940 | rmdir($zipdir); |
| 941 | 941 | } |
| 942 | 942 | if ($data !== FALSE) { |
| 943 | 943 | header('Content-Type: application/zip'); |
| 944 | - header("Content-Disposition: attachment; filename=\"detail-".$this->identifier . '-' .$this->institution.".zip\""); |
|
| 944 | + header("Content-Disposition: attachment; filename=\"detail-".$this->identifier.'-'.$this->institution.".zip\""); |
|
| 945 | 945 | header("Content-Transfer-Encoding: binary"); |
| 946 | 946 | echo $data; |
| 947 | 947 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | $remove = 0; |
| 5 | 5 | $opn = $vlans = ''; |
| 6 | 6 | $guest_vlan = 0; |
| 7 | -if ( isset($_POST['enc']) && $_POST['enc'] != '' && ($enc=base64_decode($_POST['enc'], true)) !== false ) { |
|
| 7 | +if (isset($_POST['enc']) && $_POST['enc'] != '' && ($enc = base64_decode($_POST['enc'], true)) !== false) { |
|
| 8 | 8 | $decrypted = openssl_decrypt($enc, "CHACHA20", SERVER_SECRET, 0, SERVER_IV); |
| 9 | 9 | if ($decrypted === false) { |
| 10 | 10 | echo "FAILURE"; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | # when a request contains logid and backlog ";s:11:"DEBUG-11-52";s:7:"backlog";s:1:"7";} |
| 21 | -if ( isset($darr['logid']) && isset($darr['backlog']) && isset($darr['iv']) ) { |
|
| 21 | +if (isset($darr['logid']) && isset($darr['backlog']) && isset($darr['iv'])) { |
|
| 22 | 22 | if (substr($darr['logid'], 0, 5) == 'DEBUG') { |
| 23 | 23 | $logid = substr($darr['logid'], 6); |
| 24 | 24 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | $cnt = 0; |
| 28 | 28 | if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) { |
| 29 | 29 | $content = file_get_contents($res); |
| 30 | - $encrypted = openssl_encrypt(SERVER_TOKEN . $content, "CHACHA20", SERVER_SECRET, 0, $iv); |
|
| 30 | + $encrypted = openssl_encrypt(SERVER_TOKEN.$content, "CHACHA20", SERVER_SECRET, 0, $iv); |
|
| 31 | 31 | header('Content-Type: application/octet-stream'); |
| 32 | 32 | header("Content-Transfer-Encoding: binary"); |
| 33 | 33 | echo "ZIPDATA:$encrypted"; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | if (isset($darr['vlan']) && isset($darr['realmforvlan']) && |
| 54 | 54 | is_array($darr['realmforvlan'])) { |
| 55 | - $vlans = $darr['vlan'] . '#' . implode('#', $darr['realmforvlan']); |
|
| 55 | + $vlans = $darr['vlan'].'#'.implode('#', $darr['realmforvlan']); |
|
| 56 | 56 | } |
| 57 | 57 | if (isset($darr['guest_vlan'])) { |
| 58 | 58 | $guest_vlan = $darr['guest_vlan']; |
