@@ -159,7 +159,7 @@ |
||
| 159 | 159 | echo "0\">"; |
| 160 | 160 | echo _("This service is for authenticated admins only.") . '<br>'; |
| 161 | 161 | echo "<a href=\"diag.php?admin=1\">" . |
| 162 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 162 | + _("eduroam® admin access is needed") . "</a>"; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | <div id="realm_problem"> |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * License: see the web/copyright.inc.php file in the file structure or |
| 20 | 20 | * <base_url>/copyright.php after deploying the software |
| 21 | 21 | */ |
| 22 | - ?> |
|
| 22 | + ?> |
|
| 23 | 23 | <?php |
| 24 | 24 | $Gui = new \web\lib\user\Gui(); |
| 25 | 25 | $Gui->languageInstance->setTextDomain("diagnostics"); |
@@ -326,9 +326,9 @@ |
||
| 326 | 326 | $otherTlsName = \core\common\Entity::getAttributeValue($this->attributes, 'eap-specific:tls_use_other_id', 0) === 'on' ? 'true' : 'false'; |
| 327 | 327 | if (isset(\core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0]) && |
| 328 | 328 | \core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0] === 'on') { |
| 329 | - $this->useGeantLink = true; |
|
| 329 | + $this->useGeantLink = true; |
|
| 330 | 330 | } else { |
| 331 | - $this->useGeantLink = false; |
|
| 331 | + $this->useGeantLink = false; |
|
| 332 | 332 | } |
| 333 | 333 | $eapConfig = $this->setEapObject(); |
| 334 | 334 | $eapConfig->setInnerType($this->selectedEap['INNER']); |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | " . $Tou['title'] . " |
| 52 | 52 | </h1> |
| 53 | 53 | <div id='tou_1'>" . $Tou['subtitle'] . |
| 54 | - '<div style="direction:ltr">' . $Tou['short'] . "</div> |
|
| 54 | + '<div style="direction:ltr">' . $Tou['short'] . "</div> |
|
| 55 | 55 | </div> |
| 56 | 56 | <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div> |
| 57 | 57 | <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" . |
@@ -278,7 +278,7 @@ |
||
| 278 | 278 | <tr> |
| 279 | 279 | <td>" . |
| 280 | 280 | $cat->catVersion |
| 281 | - ." |
|
| 281 | + ." |
|
| 282 | 282 | </td>"; |
| 283 | 283 | |
| 284 | 284 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | public function divSilverbullet() { |
| 125 | 125 | $retval = " |
| 126 | 126 | <div id='silverbullet'>" |
| 127 | - .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
| 127 | + .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
| 128 | 128 | "</div> |
| 129 | 129 | "; |
| 130 | 130 | return $retval; |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | $retval .= "<td><button name='$d' class='other_os' id='$d'>".$D['display']."</button>" |
| 296 | - ."</td>" |
|
| 297 | - ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n"; |
|
| 296 | + ."</td>" |
|
| 297 | + ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n"; |
|
| 298 | 298 | $deviceIndex++; |
| 299 | 299 | } |
| 300 | 300 | $retval .= "</tbody>"; |
@@ -341,11 +341,11 @@ discard block |
||
| 341 | 341 | <tr> |
| 342 | 342 | <td>" . |
| 343 | 343 | $this->Gui->catVersion |
| 344 | - ." |
|
| 344 | + ." |
|
| 345 | 345 | </td>"; |
| 346 | 346 | |
| 347 | 347 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
| 348 | - $retval .= "<td>".$this->Gui->catCopyrifhtAndLicense."<br><span id='privacy_notice_cons'>".\config\ConfAssistant::CONSORTIUM['display_name']."</span> <a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), '')."</a></td>"; |
|
| 348 | + $retval .= "<td>".$this->Gui->catCopyrifhtAndLicense."<br><span id='privacy_notice_cons'>".\config\ConfAssistant::CONSORTIUM['display_name']."</span> <a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), '')."</a></td>"; |
|
| 349 | 349 | } |
| 350 | 350 | $retval .= "<td>"; |
| 351 | 351 | if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { |
@@ -218,7 +218,7 @@ |
||
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | - break; |
|
| 221 | + break; |
|
| 222 | 222 | default: |
| 223 | 223 | break; |
| 224 | 224 | } |
@@ -395,8 +395,8 @@ |
||
| 395 | 395 | $reqserial = $newReq->sendRequestToCa($csr, $revocationPin, $expiryDays); |
| 396 | 396 | $this->loggerInstance->writeAudit($user, "NEW", "Certificate request - NRO: ".$this->tld." - serial: ".$reqserial." - subject: ".$csr['SUBJECT']); |
| 397 | 397 | $reqQuery = "INSERT INTO federation_servercerts " |
| 398 | - ."(federation_id, ca_name, request_serial, distinguished_name, status, revocation_pin) " |
|
| 399 | - ."VALUES (?, 'eduPKI', ?, ?, 'REQUESTED', ?)"; |
|
| 398 | + ."(federation_id, ca_name, request_serial, distinguished_name, status, revocation_pin) " |
|
| 399 | + ."VALUES (?, 'eduPKI', ?, ?, 'REQUESTED', ?)"; |
|
| 400 | 400 | $this->databaseHandle->exec($reqQuery, "siss", $this->tld, $reqserial, $csr['SUBJECT'], $revocationPin); |
| 401 | 401 | } |
| 402 | 402 | |