@@ -25,7 +25,7 @@ |
||
25 | 25 | * @author Tomasz Wolniewicz <[email protected]> |
26 | 26 | * @package ModuleWriting |
27 | 27 | */ |
28 | - class Device_W8_10 extends WindowsCommon { |
|
28 | + class Device_W8_10 extends WindowsCommon { |
|
29 | 29 | final public function __construct() { |
30 | 30 | parent::__construct(); |
31 | 31 | $this->setSupportedEapMethods( |
@@ -32,4 +32,4 @@ |
||
32 | 32 | |
33 | 33 | |
34 | 34 | // and now, serve actual data |
35 | -include("skins/".$skinObject->skin."/basic.php"); |
|
35 | +include("skins/" . $skinObject->skin . "/basic.php"); |
@@ -539,47 +539,47 @@ |
||
539 | 539 | ["SETTING" => CONFIG['APPEARANCE']['from-mail'], |
540 | 540 | "DEFVALUE" => "[email protected]", |
541 | 541 | "COMPLAINTSTRING" => "APPEARANCE/from-mail ", |
542 | - "REQUIRED" => FALSE,], |
|
542 | + "REQUIRED" => FALSE, ], |
|
543 | 543 | ["SETTING" => CONFIG['APPEARANCE']['support-contact']['url'], |
544 | 544 | "DEFVALUE" => "[email protected]?body=Only%20English%20language%20please!", |
545 | 545 | "COMPLAINTSTRING" => "APPEARANCE/support-contact/url ", |
546 | - "REQUIRED" => FALSE,], |
|
546 | + "REQUIRED" => FALSE, ], |
|
547 | 547 | ["SETTING" => CONFIG['APPEARANCE']['support-contact']['display'], |
548 | 548 | "DEFVALUE" => "[email protected]", |
549 | 549 | "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ", |
550 | - "REQUIRED" => FALSE,], |
|
550 | + "REQUIRED" => FALSE, ], |
|
551 | 551 | ["SETTING" => CONFIG['APPEARANCE']['support-contact']['developer-mail'], |
552 | 552 | "DEFVALUE" => "[email protected]", |
553 | 553 | "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ", |
554 | - "REQUIRED" => FALSE,], |
|
554 | + "REQUIRED" => FALSE, ], |
|
555 | 555 | ["SETTING" => CONFIG['APPEARANCE']['abuse-mail'], |
556 | 556 | "DEFVALUE" => "[email protected]", |
557 | 557 | "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ", |
558 | - "REQUIRED" => FALSE,], |
|
558 | + "REQUIRED" => FALSE, ], |
|
559 | 559 | ["SETTING" => CONFIG['APPEARANCE']['MOTD'], |
560 | 560 | "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!", |
561 | 561 | "COMPLAINTSTRING" => "APPEARANCE/MOTD ", |
562 | - "REQUIRED" => FALSE,], |
|
562 | + "REQUIRED" => FALSE, ], |
|
563 | 563 | ["SETTING" => CONFIG['APPEARANCE']['webcert_CRLDP'], |
564 | 564 | "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'], |
565 | 565 | "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ", |
566 | - "REQUIRED" => TRUE,], |
|
566 | + "REQUIRED" => TRUE, ], |
|
567 | 567 | ["SETTING" => CONFIG['APPEARANCE']['webcert_OCSP'], |
568 | 568 | "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'], |
569 | 569 | "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ", |
570 | - "REQUIRED" => TRUE,], |
|
570 | + "REQUIRED" => TRUE, ], |
|
571 | 571 | ["SETTING" => CONFIG['DB']['INST']['host'], |
572 | 572 | "DEFVALUE" => "db.host.example", |
573 | 573 | "COMPLAINTSTRING" => "DB/INST ", |
574 | - "REQUIRED" => TRUE,], |
|
574 | + "REQUIRED" => TRUE, ], |
|
575 | 575 | ["SETTING" => CONFIG['DB']['INST']['host'], |
576 | 576 | "DEFVALUE" => "db.host.example", |
577 | 577 | "COMPLAINTSTRING" => "DB/USER ", |
578 | - "REQUIRED" => TRUE,], |
|
578 | + "REQUIRED" => TRUE, ], |
|
579 | 579 | ["SETTING" => CONFIG['DB']['EXTERNAL']['host'], |
580 | 580 | "DEFVALUE" => "customerdb.otherhost.example", |
581 | 581 | "COMPLAINTSTRING" => "DB/EXTERNAL ", |
582 | - "REQUIRED" => FALSE,], |
|
582 | + "REQUIRED" => FALSE, ], |
|
583 | 583 | ]; |
584 | 584 | |
585 | 585 | /** |
@@ -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); |
@@ -239,7 +239,6 @@ |
||
239 | 239 | /** |
240 | 240 | * revokes an invitation |
241 | 241 | * |
242 | - * @param int $invitationId |
|
243 | 242 | */ |
244 | 243 | public function revokeInvitation() { |
245 | 244 | $query = "UPDATE silverbullet_invitation SET expiry = NOW() WHERE id = ? AND profile_id = ?"; |
@@ -133,7 +133,7 @@ |
||
133 | 133 | $certificatesNumber = ($certificatesResult ? $certificatesResult->num_rows : 0); |
134 | 134 | $this->loggerInstance->debug(5, "At token validation level, " . $certificatesNumber . " certificates exist.\n"); |
135 | 135 | $this->associatedCertificates = \core\ProfileSilverbullet::enumerateCertDetails(/** @scrutinizer ignore-type */ $certificatesResult); |
136 | - $this->activationsRemaining = (int)$this->activationsTotal - (int)$certificatesNumber; |
|
136 | + $this->activationsRemaining = (int) $this->activationsTotal - (int) $certificatesNumber; |
|
137 | 137 | switch ($certificatesNumber) { |
138 | 138 | case 0: |
139 | 139 | // find out if it has expired |