@@ -188,7 +188,6 @@ discard block |
||
| 188 | 188 | |
| 189 | 189 | /** |
| 190 | 190 | * returns the body to use in an invitation mail |
| 191 | - * @param string $invitationLink the activation token link to embed |
|
| 192 | 191 | * @return string |
| 193 | 192 | */ |
| 194 | 193 | public function invitationMailBody() { |
@@ -233,7 +232,6 @@ discard block |
||
| 233 | 232 | /** |
| 234 | 233 | * revokes an invitation |
| 235 | 234 | * |
| 236 | - * @param int $invitationId |
|
| 237 | 235 | */ |
| 238 | 236 | public function revokeInvitation() { |
| 239 | 237 | $query = "UPDATE silverbullet_invitation SET expiry = NOW() WHERE id = ? AND profile_id = ?"; |
@@ -28,6 +28,6 @@ |
||
| 28 | 28 | $invitationObject = new core\SilverbulletInvitation($validator->token(filter_input(INPUT_POST, 'token'))); |
| 29 | 29 | header("Content-Type:text/html;charset=utf-8"); |
| 30 | 30 | ?> |
| 31 | -<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1> |
|
| 32 | -<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($invitationObject->link(), FALSE, QR_ECLEVEL_Q, 11), 11));?>'/> |
|
| 33 | -<p>(<a href='<?php echo $link;?>'><?php echo $link;?>)</a></p> |
|
| 31 | +<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1> |
|
| 32 | +<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($invitationObject->link(), FALSE, QR_ECLEVEL_Q, 11), 11)); ?>'/> |
|
| 33 | +<p>(<a href='<?php echo $link; ?>'><?php echo $link; ?>)</a></p> |
|
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | // it can be VALID (exists and not redeemed, EXPIRED, REDEEMED or INVALID (non existent) |
| 37 | 37 | $invitationObject = new core\SilverbulletInvitation($cleanToken); |
| 38 | 38 | } |
| 39 | -} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0']) ) { |
|
| 39 | +} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0'])) { |
|
| 40 | 40 | // maybe the user authenticated with his client cert? Then pick any of his |
| 41 | 41 | // tokens to go on |
| 42 | 42 | $certname = $_SERVER['SSL_CLIENT_SAN_Email'] ?? $_SERVER['SSL_CLIENT_SAN_Email_0']; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | $statusInfo = ["token" => $cleanToken, |
| 62 | 62 | "invitation_object" => $invitationObject, |
| 63 | - "OS" => $Gui->operatingSystem,]; |
|
| 63 | + "OS" => $Gui->operatingSystem, ]; |
|
| 64 | 64 | |
| 65 | 65 | if ($profile !== NULL) { |
| 66 | 66 | $attributes = $Gui->profileAttributes($profile->identifier); |
@@ -455,7 +455,7 @@ |
||
| 455 | 455 | $indexStatement = "$certstatus\t$expiryIndexTxt\t" . ($certstatus == "R" ? "$nowIndexTxt,unspecified" : "") . "\t$serialHex\tunknown\t/O=" . CONFIG_CONFASSISTANT['CONSORTIUM']['name'] . "/OU=$federation/CN=$cn/emailAddress=$cn\n"; |
| 456 | 456 | $logHandle->debug(4, "index.txt contents-to-be: $indexStatement"); |
| 457 | 457 | if (!file_put_contents($tempdir . "/index.txt", $indexStatement)) { |
| 458 | - $logHandle->debug(1,"Unable to write openssl index.txt file for revocation handling!"); |
|
| 458 | + $logHandle->debug(1, "Unable to write openssl index.txt file for revocation handling!"); |
|
| 459 | 459 | } |
| 460 | 460 | // index.txt.attr is dull but needs to exist |
| 461 | 461 | file_put_contents($tempdir . "/index.txt.attr", "unique_subject = yes\n"); |