@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | exec("openssl ocsp -reqin $derFilePath -req_text", $output, $retval); |
98 | 98 | |
99 | 99 | if ($retval !== 0) { |
100 | - throw new Exception("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: " . base64_encode($ocspRequestDer)); |
|
100 | + throw new Exception("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: ".base64_encode($ocspRequestDer)); |
|
101 | 101 | } |
102 | 102 | if ($output === NULL) { // this can't really happen, but makes Scrutinizer happier |
103 | 103 | $output = []; |
@@ -127,14 +127,14 @@ discard block |
||
127 | 127 | * back (if we have it). |
128 | 128 | */ |
129 | 129 | if (strcasecmp($nameHash, OUR_NAME_HASH) != 0 || strcasecmp($keyHash, OUR_KEY_HASH) != 0) { |
130 | - throw new Exception("The request is about a different Issuer name / public key. Expected vs. actual name hash: " . OUR_NAME_HASH . " / $nameHash, " . OUR_KEY_HASH . " / $keyHash"); |
|
130 | + throw new Exception("The request is about a different Issuer name / public key. Expected vs. actual name hash: ".OUR_NAME_HASH." / $nameHash, ".OUR_KEY_HASH." / $keyHash"); |
|
131 | 131 | } |
132 | -error_log("base64-encoded request: " . base64_encode($ocspRequestDer)); |
|
132 | +error_log("base64-encoded request: ".base64_encode($ocspRequestDer)); |
|
133 | 133 | |
134 | -$response = fopen(__DIR__ . "/statements/" . $serialHex . ".der", "r"); |
|
134 | +$response = fopen(__DIR__."/statements/".$serialHex.".der", "r"); |
|
135 | 135 | if ($response === FALSE) { // not found |
136 | 136 | // first lets load the unauthorised response, which is the default reply |
137 | - $unauthResponse = fopen(__DIR__ . "/statements/UNAUTHORIZED.der", "r"); |
|
137 | + $unauthResponse = fopen(__DIR__."/statements/UNAUTHORIZED.der", "r"); |
|
138 | 138 | if ($unauthResponse === FALSE) { |
139 | 139 | throw new Exception("Unable to open our canned UNAUTHORIZED response!"); |
140 | 140 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | $responseContent = fread($response, 1000000); |
178 | 178 | fclose($response); |
179 | -error_log("base64-encoded response: " . base64_encode($responseContent)); |
|
179 | +error_log("base64-encoded response: ".base64_encode($responseContent)); |
|
180 | 180 | header('Content-Type: application/ocsp-response'); |
181 | -header('Content-Length: ' . strlen($responseContent)); |
|
181 | +header('Content-Length: '.strlen($responseContent)); |
|
182 | 182 | echo $responseContent; |
@@ -49,14 +49,14 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | switch ($_GET['token']) { |
52 | - case "SELF-REGISTER": |
|
53 | - $token = "SELF-REGISTER"; |
|
54 | - $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; |
|
55 | - $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration']; |
|
56 | - break; |
|
57 | - default: |
|
58 | - $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); |
|
59 | - $checkval = $usermgmt->checkTokenValidity($token); |
|
52 | + case "SELF-REGISTER": |
|
53 | + $token = "SELF-REGISTER"; |
|
54 | + $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; |
|
55 | + $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration']; |
|
56 | + break; |
|
57 | + default: |
|
58 | + $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); |
|
59 | + $checkval = $usermgmt->checkTokenValidity($token); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | if ($checkval < 0) { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | ?> |
31 | 31 | <?php |
32 | 32 | |
33 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
33 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
34 | 34 | |
35 | 35 | $auth = new \web\lib\admin\Authentication(); |
36 | 36 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -41,11 +41,11 @@ discard block |
||
41 | 41 | $auth->authenticate(); |
42 | 42 | |
43 | 43 | if (!isset($_GET['token'])) { |
44 | - $elements->errorPage(_("Error creating new IdP binding!"),_("This page needs to be called with a valid invitation token!")); |
|
44 | + $elements->errorPage(_("Error creating new IdP binding!"), _("This page needs to be called with a valid invitation token!")); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL && $_GET['token'] == "SELF-REGISTER") { |
48 | - $elements->errorPage(_("Error creating new IdP binding!"),_("You tried to register in self-service, but this deployment does not allow self-service!")); |
|
48 | + $elements->errorPage(_("Error creating new IdP binding!"), _("You tried to register in self-service, but this deployment does not allow self-service!")); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | switch ($_GET['token']) { |
@@ -55,22 +55,22 @@ discard block |
||
55 | 55 | $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration']; |
56 | 56 | break; |
57 | 57 | default: |
58 | - $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); |
|
58 | + $token = $validator->token(filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING)); |
|
59 | 59 | $checkval = $usermgmt->checkTokenValidity($token); |
60 | 60 | } |
61 | 61 | |
62 | 62 | if ($checkval < 0) { |
63 | 63 | echo $deco->pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP"); |
64 | - echo "<h1>" . _("Error creating new IdP binding!") . "</h1>"; |
|
64 | + echo "<h1>"._("Error creating new IdP binding!")."</h1>"; |
|
65 | 65 | switch ($checkval) { |
66 | 66 | case \core\UserManagement::TOKENSTATUS_FAIL_ALREADYCONSUMED: |
67 | - echo "<p>" . sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant) . "</p>"; |
|
67 | + echo "<p>".sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant)."</p>"; |
|
68 | 68 | break; |
69 | 69 | case \core\UserManagement::TOKENSTATUS_FAIL_EXPIRED: |
70 | - echo "<p>" . sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed) . "</p>"; |
|
70 | + echo "<p>".sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed)."</p>"; |
|
71 | 71 | break; |
72 | 72 | default: |
73 | - echo "<p>" . _("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.") . "</p>"; |
|
73 | + echo "<p>"._("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.")."</p>"; |
|
74 | 74 | } |
75 | 75 | echo $deco->footer(); |
76 | 76 | throw new Exception("Terminating because something is wrong with the token we received."); |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | case "SELF-REGISTER": |
86 | 86 | $fed = new \core\Federation($federation); |
87 | 87 | $newidp = new \core\IdP($fed->newIdP(core\IdP::TYPE_IDPSP, $user, "FED", "SELFSERVICE")); |
88 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice registration"); |
|
88 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice registration"); |
|
89 | 89 | break; |
90 | 90 | default: |
91 | 91 | $newidp = $usermgmt->createIdPFromToken($token, $user); |
92 | 92 | $usermgmt->invalidateToken($token); |
93 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - Token used and invalidated"); |
|
93 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - Token used and invalidated"); |
|
94 | 94 | break; |
95 | 95 | } |
96 | 96 |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $this->activationsTotal = $invitationRow->quantity; |
146 | 146 | $certificatesResult = $this->databaseHandle->exec("SELECT `serial_number`, `ca_type` FROM `silverbullet_certificate` WHERE `silverbullet_invitation_id` = ? ORDER BY `revocation_status`, `expiry` DESC", "i", $this->identifier); |
147 | 147 | $certificatesNumber = ($certificatesResult ? $certificatesResult->num_rows : 0); |
148 | - $this->loggerInstance->debug(5, "At token validation level, " . $certificatesNumber . " certificates exist.\n"); |
|
148 | + $this->loggerInstance->debug(5, "At token validation level, ".$certificatesNumber." certificates exist.\n"); |
|
149 | 149 | // SELECT -> resource, no boolean |
150 | 150 | while ($runner = mysqli_fetch_object(/** @scrutinizer ignore-type */ $certificatesResult)) { |
151 | 151 | $this->associatedCertificates[] = new \core\SilverbulletCertificate($runner->serial_number, $runner->ca_type); |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | throw new Exception("Uh. Something went seriously wrong with URL path mangling."); |
205 | 205 | } |
206 | 206 | } |
207 | - $link = $link . $relPath; |
|
207 | + $link = $link.$relPath; |
|
208 | 208 | |
209 | 209 | if (preg_match('/admin$/', $link)) { |
210 | 210 | $link = substr($link, 0, -6); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | } |
214 | 214 | } |
215 | 215 | |
216 | - return $link . '/accountstatus/accountstatus.php?token=' . $this->invitationTokenString; |
|
216 | + return $link.'/accountstatus/accountstatus.php?token='.$this->invitationTokenString; |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."), \config\ConfAssistant::CONSORTIUM['display_name']); |
241 | 241 | $text .= " "; |
242 | 242 | $text .= sprintf(_("Please follow the following link with the device you want to enable for %s to get a custom %s installation program just for you. You can click on the link, copy and paste it into a browser or scan the attached QR code."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']); |
243 | - $text .= "\n\n" . $this->link() . "\n\n"; // gets replaced with the token value by getBody() |
|
243 | + $text .= "\n\n".$this->link()."\n\n"; // gets replaced with the token value by getBody() |
|
244 | 244 | $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']); |
245 | 245 | $text .= "\n\n"; |
246 | 246 | $text .= _("Regards,"); |
@@ -42,8 +42,8 @@ |
||
42 | 42 | $auth->authenticate(); |
43 | 43 | } |
44 | 44 | if (isset($_SESSION['admin_diag_auth'])) { |
45 | - $admin = 1; |
|
46 | - unset($_SESSION['admin_diag_auth']); |
|
45 | + $admin = 1; |
|
46 | + unset($_SESSION['admin_diag_auth']); |
|
47 | 47 | } |
48 | 48 | $Gui = new \web\lib\user\Gui(); |
49 | 49 | $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]); |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
23 | 23 | $admin = filter_input(INPUT_GET, 'admin', FILTER_VALIDATE_INT); |
24 | 24 | $sp = filter_input(INPUT_GET, 'sp', FILTER_VALIDATE_INT); |
25 | 25 | $givenRealm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | unset($q_el[$idx]); |
36 | 36 | $q_r = preg_replace("/\?.*/", "", $_SERVER['REQUEST_URI']); |
37 | 37 | if (count($q_el)) { |
38 | - $q_r = $q_r . '?' . implode('&', $q_el); |
|
38 | + $q_r = $q_r.'?'.implode('&', $q_el); |
|
39 | 39 | } |
40 | 40 | $_SERVER['REQUEST_URI'] = $q_r; |
41 | 41 | } |
@@ -44,11 +44,11 @@ discard block |
||
44 | 44 | $auth->authenticate(); |
45 | 45 | } |
46 | 46 | if (isset($_SESSION['admin_diag_auth'])) { |
47 | - $admin = 1; |
|
47 | + $admin = 1; |
|
48 | 48 | unset($_SESSION['admin_diag_auth']); |
49 | 49 | } |
50 | 50 | $Gui = new \web\lib\user\Gui(); |
51 | 51 | $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]); |
52 | -require "../skins/" . $skinObject->skin . "/diag/diag.php"; |
|
52 | +require "../skins/".$skinObject->skin."/diag/diag.php"; |
|
53 | 53 | |
54 | 54 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
23 | 23 | require_once \config\Master::AUTHENTICATION['ssp-path-to-autoloader']; |
24 | 24 | |
25 | 25 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -38,13 +38,13 @@ discard block |
||
38 | 38 | if ($cutoff !== FALSE) { |
39 | 39 | $substring = substr($_SERVER['PHP_SELF'], 0, $cutoff); |
40 | 40 | if ($substring !== FALSE) { |
41 | - $url = "//" . htmlspecialchars($_SERVER['SERVER_NAME']) . $substring; |
|
41 | + $url = "//".htmlspecialchars($_SERVER['SERVER_NAME']).$substring; |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 | header("Location: $url"); |
45 | 45 | } else { |
46 | 46 | /* Logout failed. Tell the user to close the browser. */ |
47 | 47 | echo $deco->pageheader(_("Incomplete Logout"), "ADMIN", FALSE); |
48 | - echo "<p>" . _("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.") . "</p>"; |
|
48 | + echo "<p>"._("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.")."</p>"; |
|
49 | 49 | echo $deco->footer(); |
50 | 50 | } |
@@ -19,13 +19,13 @@ |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -$out = "<h3>" . _("Access the sources") . "</h3>" . |
|
23 | - sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), \config\Master::APPEARANCE['productname'], "https://github.com/GEANT/CAT" ) . |
|
24 | - "<h3>" . _("Join the developers mailing list.") . "</h3>" . |
|
25 | - sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']) . |
|
26 | - "<h3>" . _("Add a translation") . "</h3>" . |
|
27 | - _("If you would like to add a new language to CAT then please contact us ...") . |
|
28 | - "<h3><a href='" . \core\CAT::getRootUrlPath() . "/apidoc' target='_blank'>". _("Documentation") . "</a></h3>" ; |
|
22 | +$out = "<h3>"._("Access the sources")."</h3>". |
|
23 | + sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), \config\Master::APPEARANCE['productname'], "https://github.com/GEANT/CAT"). |
|
24 | + "<h3>"._("Join the developers mailing list.")."</h3>". |
|
25 | + sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']). |
|
26 | + "<h3>"._("Add a translation")."</h3>". |
|
27 | + _("If you would like to add a new language to CAT then please contact us ..."). |
|
28 | + "<h3><a href='".\core\CAT::getRootUrlPath()."/apidoc' target='_blank'>"._("Documentation")."</a></h3>"; |
|
29 | 29 | |
30 | 30 | |
31 | 31 |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @package UserGUI |
27 | 27 | */ |
28 | 28 | error_reporting(E_ALL | E_STRICT); |
29 | -require dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
29 | +require dirname(dirname(__FILE__))."/config/_config.php"; |
|
30 | 30 | $langObject = new \core\common\Language(); |
31 | 31 | $langObject->setTextDomain("web_user"); |
32 | 32 | |
@@ -38,25 +38,25 @@ discard block |
||
38 | 38 | <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'> |
39 | 39 | <div id="heading"> |
40 | 40 | <?php |
41 | - print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
42 | - print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : ' ' ) . '</div>'; |
|
43 | - print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1> |
|
44 | -<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>'; |
|
41 | + print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
42 | + print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : ' ').'</div>'; |
|
43 | + print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1> |
|
44 | +<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>'; |
|
45 | 45 | echo '<table id="lang_select"><tr><td>'; |
46 | 46 | echo _("View this page in"); |
47 | 47 | ?> |
48 | 48 | <?php |
49 | 49 | foreach (\config\Master::LANGUAGES as $lang => $value) { |
50 | - echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> "; |
|
50 | + echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> "; |
|
51 | 51 | } |
52 | - echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>'; |
|
52 | + echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>'; |
|
53 | 53 | ?> |
54 | 54 | </div> <!-- id="heading" --> |
55 | 55 | <div id="main_body" style='padding:20px;'> |
56 | - <h1><?php echo _("This is not the CAT you are looking for.");?></h1> |
|
57 | - <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p> |
|
56 | + <h1><?php echo _("This is not the CAT you are looking for."); ?></h1> |
|
57 | + <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p> |
|
58 | 58 | <h2>404</h2> |
59 | - <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p> |
|
59 | + <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang()); ?></p> |
|
60 | 60 | </div> <!-- id="main_body" --> |
61 | 61 | |
62 | 62 | <?php echo $deco->footer(); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @author Stefan Winter <[email protected]> |
27 | 27 | * @package Core |
28 | 28 | */ |
29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | $cleanToken = FALSE; |
32 | 32 | $invitationObject = new core\SilverbulletInvitation("INVALID"); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | $statusInfo = ["token" => $cleanToken, |
75 | 75 | "invitation_object" => $invitationObject, |
76 | - "OS" => $Gui->operatingSystem,]; |
|
76 | + "OS" => $Gui->operatingSystem, ]; |
|
77 | 77 | |
78 | 78 | if ($profile !== NULL) { |
79 | 79 | $attributes = $Gui->profileAttributes($profile->identifier); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $caAndSerial = filter_input(INPUT_GET, 'serial', FILTER_SANITIZE_STRING); |
87 | 87 | |
88 | 88 | if ($action !== NULL && $action !== FALSE && $action === \web\lib\common\FormElements::BUTTON_DELETE && $caAndSerial !== NULL && $caAndSerial !== FALSE) { |
89 | - $tuple = explode(':',$caAndSerial); |
|
89 | + $tuple = explode(':', $caAndSerial); |
|
90 | 90 | $ca_type = $tuple[0]; |
91 | 91 | $serial = $tuple[1]; |
92 | 92 | if ($statusInfo['invitation_object']->invitationTokenStatus != \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID) { |
@@ -101,12 +101,12 @@ discard block |
||
101 | 101 | print "//REVOKING\n"; |
102 | 102 | $certObject = new \core\SilverbulletCertificate($serial, $ca_type); |
103 | 103 | $certObject->revokeCertificate(); |
104 | - header("Location: accountstatus.php?token=" . $statusInfo['token']); |
|
104 | + header("Location: accountstatus.php?token=".$statusInfo['token']); |
|
105 | 105 | exit; |
106 | 106 | } |
107 | 107 | } |
108 | 108 | } |
109 | - header("Location: accountstatus.php?token=" . $statusInfo['token']); |
|
109 | + header("Location: accountstatus.php?token=".$statusInfo['token']); |
|
110 | 110 | exit; |
111 | 111 | } |
112 | 112 | |
@@ -131,4 +131,4 @@ discard block |
||
131 | 131 | $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]); |
132 | 132 | |
133 | 133 | // and now, serve actual data |
134 | -require "../skins/" . $skinObject->skin . "/accountstatus/accountstatus.php"; |
|
134 | +require "../skins/".$skinObject->skin."/accountstatus/accountstatus.php"; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @package UserGUI |
27 | 27 | */ |
28 | 28 | error_reporting(E_ALL | E_STRICT); |
29 | -require dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
29 | +require dirname(dirname(__FILE__))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | $langObject = new \core\common\Language(); |
32 | 32 | $langObject->setTextDomain("web_user"); |
@@ -39,24 +39,24 @@ discard block |
||
39 | 39 | <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'> |
40 | 40 | <div id="heading"> |
41 | 41 | <?php |
42 | - print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
43 | - print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : ' ' ) . '</div>'; |
|
44 | - print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1> |
|
45 | -<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>'; |
|
42 | + print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
43 | + print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : ' ').'</div>'; |
|
44 | + print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1> |
|
45 | +<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>'; |
|
46 | 46 | echo '<table id="lang_select"><tr><td>'; |
47 | 47 | echo _("View this page in"); |
48 | 48 | ?> |
49 | 49 | <?php |
50 | 50 | foreach (\config\Master::LANGUAGES as $lang => $value) { |
51 | - echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> "; |
|
51 | + echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> "; |
|
52 | 52 | } |
53 | - echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>'; |
|
53 | + echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>'; |
|
54 | 54 | ?> |
55 | 55 | </div> <!-- id="heading" --> |
56 | 56 | <div id="main_body" style='padding:20px;'> |
57 | - <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1> |
|
58 | - <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p> |
|
57 | + <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1> |
|
58 | + <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p> |
|
59 | 59 | <h2>401/403</h2> |
60 | - <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang())?></p> |
|
60 | + <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang())?></p> |
|
61 | 61 | </div> |
62 | 62 | <?php echo $deco->footer(); |