GEANT /
CAT
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | private function inputValidationError($customtext) |
| 41 | 41 | { |
| 42 | 42 | \core\common\Entity::intoThePotatoes(); |
| 43 | - $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>"; |
|
| 43 | + $retval = "<p>"._("Input validation error: ").$customtext."</p>"; |
|
| 44 | 44 | \core\common\Entity::outOfThePotatoes(); |
| 45 | 45 | return $retval; |
| 46 | 46 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $postFed = $fedIdentifiers[$correctIndex]; |
| 98 | 98 | $temp = new \core\Federation($postFed); |
| 99 | 99 | if ($owner === NULL) { |
| 100 | - return [$temp,'readonly']; |
|
| 100 | + return [$temp, 'readonly']; |
|
| 101 | 101 | } |
| 102 | 102 | $user = new \core\User($owner); |
| 103 | 103 | foreach ($temp->listFederationAdmins() as $oneowner) { |
@@ -105,9 +105,9 @@ discard block |
||
| 105 | 105 | return [$temp, 'fullaccess']; |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | - if ($user->isSuperadmin()|| $user->isSupport()) { |
|
| 108 | + if ($user->isSuperadmin() || $user->isSupport()) { |
|
| 109 | 109 | $this->loggerInstance->debug(4, "You are the superadmin/support\n"); |
| 110 | - return [$temp,'readonly']; |
|
| 110 | + return [$temp, 'readonly']; |
|
| 111 | 111 | } |
| 112 | 112 | throw new Exception($this->inputValidationError(sprintf("User is not %s administrator!", \core\common\Entity::$nomenclature_fed))); |
| 113 | 113 | } |
@@ -168,18 +168,18 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | if ($user->isFederationAdmin($temp->federation)) { |
| 170 | 170 | $this->loggerInstance->debug(4, "You are fed admin for this IdP\n"); |
| 171 | - return [$temp,'readonly']; |
|
| 171 | + return [$temp, 'readonly']; |
|
| 172 | 172 | } |
| 173 | 173 | if ($user->isSuperadmin() || $user->isSupport()) { |
| 174 | 174 | $this->loggerInstance->debug(4, "You are the superadmin/support\n"); |
| 175 | - return [$temp,'readonly']; |
|
| 175 | + return [$temp, 'readonly']; |
|
| 176 | 176 | } |
| 177 | 177 | throw new Exception($this->inputValidationError("This IdP identifier is not accessible!")); |
| 178 | 178 | } |
| 179 | 179 | if ($claimedFedBinding !== NULL && strtoupper($temp->federation) != strtoupper($claimedFedBinding->tld)) { |
| 180 | 180 | throw new Exception($this->inputValidationError("This IdP does not belong to the claimed federation!")); |
| 181 | 181 | } |
| 182 | - return [$temp,'nouser']; |
|
| 182 | + return [$temp, 'nouser']; |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | /** |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | try { |
| 622 | 622 | $image->readImageBlob($binary); |
| 623 | 623 | } catch (\ImagickException $exception) { |
| 624 | - echo "Error" . $exception->getMessage(); |
|
| 624 | + echo "Error".$exception->getMessage(); |
|
| 625 | 625 | return FALSE; |
| 626 | 626 | } |
| 627 | 627 | // image survived the sanity check |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
| 22 | +require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
| 23 | 23 | $colour1 = \config\Master::APPEARANCE['colour1']; |
| 24 | 24 | $colour2 = \config\Master::APPEARANCE['colour2']; |
| 25 | 25 | // we need to know if we are serving a RTL language so we can flip some heading |
@@ -34,14 +34,14 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | body { |
| 37 | - background: <?php echo $colour1;?>; |
|
| 37 | + background: <?php echo $colour1; ?>; |
|
| 38 | 38 | color: #000000; |
| 39 | 39 | font-family:Verdana, Arial, Helvetica, sans-serif; |
| 40 | 40 | font-size:11px; |
| 41 | 41 | height: 100%; |
| 42 | 42 | margin: 0px; |
| 43 | 43 | padding: 0px; |
| 44 | - padding-<?php echo $start;?>: 0px; |
|
| 44 | + padding-<?php echo $start; ?>: 0px; |
|
| 45 | 45 | min-width: 700px; |
| 46 | 46 | font-size: 11px; |
| 47 | 47 | font-weight: normal; |
@@ -57,18 +57,18 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | button { |
| 60 | - background: <?php echo $colour2;?>; |
|
| 60 | + background: <?php echo $colour2; ?>; |
|
| 61 | 61 | color: #FFFFFF; |
| 62 | 62 | min-height: 23px; |
| 63 | - border-<?php echo $start;?>-style: outset; |
|
| 64 | - border-<?php echo $start;?>-width: 1px; |
|
| 65 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 63 | + border-<?php echo $start; ?>-style: outset; |
|
| 64 | + border-<?php echo $start; ?>-width: 1px; |
|
| 65 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 66 | 66 | border-top-style: outset; |
| 67 | 67 | border-top-width: 1px; |
| 68 | 68 | border-top-color: #8bbacb; |
| 69 | - border-<?php echo $end;?>-style: outset; |
|
| 70 | - border-<?php echo $end;?>-width: 2px; |
|
| 71 | - border-<?php echo $end;?>-color: #043d52; |
|
| 69 | + border-<?php echo $end; ?>-style: outset; |
|
| 70 | + border-<?php echo $end; ?>-width: 2px; |
|
| 71 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 72 | 72 | border-bottom-style: outset; |
| 73 | 73 | border-bottom-width: 2px; |
| 74 | 74 | border-bottom-color: #043d52; |
@@ -78,14 +78,14 @@ discard block |
||
| 78 | 78 | background:#095e80; |
| 79 | 79 | border-style:inset; |
| 80 | 80 | position: relative; |
| 81 | - <?php echo $start;?>: 3px; |
|
| 81 | + <?php echo $start; ?>: 3px; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | button.pressedDisabled { |
| 85 | 85 | background:#999; |
| 86 | 86 | border-style:inset; |
| 87 | 87 | position: relative; |
| 88 | - <?php echo $start;?>: 3px; |
|
| 88 | + <?php echo $start; ?>: 3px; |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | button.delete { |
@@ -93,14 +93,14 @@ discard block |
||
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | .problemdescription { |
| 96 | - padding-<?php echo $start;?>:40px; |
|
| 96 | + padding-<?php echo $start; ?>:40px; |
|
| 97 | 97 | padding-top: 10px; |
| 98 | 98 | padding-bottom: 10px; |
| 99 | 99 | background-color: lightyellow; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | .problemsolution { |
| 103 | - padding-<?php echo $start;?>:40px; |
|
| 103 | + padding-<?php echo $start; ?>:40px; |
|
| 104 | 104 | padding-top: 10px; |
| 105 | 105 | padding-bottom: 10px; |
| 106 | 106 | background-color: lightgreen; |
@@ -109,15 +109,15 @@ discard block |
||
| 109 | 109 | .use_borders button.alertButton { |
| 110 | 110 | color: maroon; |
| 111 | 111 | background: #bbb; |
| 112 | - border-<?php echo $start;?>-style: outset; |
|
| 113 | - border-<?php echo $start;?>-width: 1px; |
|
| 114 | - border-<?php echo $start;?>-color: #eee; |
|
| 112 | + border-<?php echo $start; ?>-style: outset; |
|
| 113 | + border-<?php echo $start; ?>-width: 1px; |
|
| 114 | + border-<?php echo $start; ?>-color: #eee; |
|
| 115 | 115 | border-top-style: outset; |
| 116 | 116 | border-top-width: 1px; |
| 117 | 117 | border-top-color: #eee; |
| 118 | - border-<?php echo $end;?>-style: outset; |
|
| 119 | - border-<?php echo $end;?>-width: 2px; |
|
| 120 | - border-<?php echo $end;?>-color: #444; |
|
| 118 | + border-<?php echo $end; ?>-style: outset; |
|
| 119 | + border-<?php echo $end; ?>-width: 2px; |
|
| 120 | + border-<?php echo $end; ?>-color: #444; |
|
| 121 | 121 | border-bottom-style: outset; |
| 122 | 122 | border-bottom-width: 2px; |
| 123 | 123 | border-bottom-color: #444; |
@@ -127,15 +127,15 @@ discard block |
||
| 127 | 127 | button[disabled] { |
| 128 | 128 | background: #bababa; |
| 129 | 129 | color: #6a6a6a; |
| 130 | - border-<?php echo $start;?>-style: inset; |
|
| 131 | - border-<?php echo $start;?>-width: 1px; |
|
| 132 | - border-<?php echo $start;?>-color: #dadada; |
|
| 130 | + border-<?php echo $start; ?>-style: inset; |
|
| 131 | + border-<?php echo $start; ?>-width: 1px; |
|
| 132 | + border-<?php echo $start; ?>-color: #dadada; |
|
| 133 | 133 | border-top-style: inset; |
| 134 | 134 | border-top-width: 1px; |
| 135 | 135 | border-top-color: #dadada; |
| 136 | - border-<?php echo $end;?>-style: outset; |
|
| 137 | - border-<?php echo $end;?>-width: 2px; |
|
| 138 | - border-<?php echo $end;?>-color: #dadada; |
|
| 136 | + border-<?php echo $end; ?>-style: outset; |
|
| 137 | + border-<?php echo $end; ?>-width: 2px; |
|
| 138 | + border-<?php echo $end; ?>-color: #dadada; |
|
| 139 | 139 | border-bottom-style: outset; |
| 140 | 140 | border-bottom-width: 2px; |
| 141 | 141 | border-bottom-color: #dadada; |
@@ -167,8 +167,8 @@ discard block |
||
| 167 | 167 | div.profilemodulebuttons { |
| 168 | 168 | position: inherit; |
| 169 | 169 | bottom: 5px; |
| 170 | - <?php echo $end;?>: 5px; |
|
| 171 | - text-align: <?php echo $end;?>; |
|
| 170 | + <?php echo $end; ?>: 5px; |
|
| 171 | + text-align: <?php echo $end; ?>; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | div.profilebox { |
@@ -189,15 +189,15 @@ discard block |
||
| 189 | 189 | display: block; |
| 190 | 190 | position: absolute; |
| 191 | 191 | top:0; |
| 192 | - <?php echo $end;?>:0; |
|
| 193 | - padding-<?php echo $end;?>:20px; |
|
| 192 | + <?php echo $end; ?>:0; |
|
| 193 | + padding-<?php echo $end; ?>:20px; |
|
| 194 | 194 | padding-top:7px; |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | div.sidebar { |
| 198 | 198 | display: inline; |
| 199 | - float: <?php echo $end;?>; |
|
| 200 | - padding-<?php echo $end;?>: 20px; |
|
| 199 | + float: <?php echo $end; ?>; |
|
| 200 | + padding-<?php echo $end; ?>: 20px; |
|
| 201 | 201 | } |
| 202 | 202 | div.sidebar a { |
| 203 | 203 | color: white; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | div.header { |
| 207 | 207 | height: 54px; |
| 208 | 208 | background: #FFFFFF; |
| 209 | - padding-<?php echo $start;?>:30px; |
|
| 209 | + padding-<?php echo $start; ?>:30px; |
|
| 210 | 210 | padding-bottom: 10px; |
| 211 | 211 | color: <?php echo $colour2?>; |
| 212 | 212 | } |
@@ -216,8 +216,8 @@ discard block |
||
| 216 | 216 | top: 54px; |
| 217 | 217 | bottom: 50px; |
| 218 | 218 | padding-top: 10px; |
| 219 | - padding-<?php echo $start;?>: 0px; |
|
| 220 | - padding-<?php echo $end;?>: 0px; |
|
| 219 | + padding-<?php echo $start; ?>: 0px; |
|
| 220 | + padding-<?php echo $end; ?>: 0px; |
|
| 221 | 221 | width:100%; |
| 222 | 222 | } |
| 223 | 223 | |
@@ -231,18 +231,18 @@ discard block |
||
| 231 | 231 | color: #FFFFFF; |
| 232 | 232 | min-height:100px; |
| 233 | 233 | overflow: auto; |
| 234 | - padding-<?php echo $start;?>:20px |
|
| 234 | + padding-<?php echo $start; ?>:20px |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | #thirdrow { |
| 238 | - padding-<?php echo $start;?>: 10px; |
|
| 239 | - padding-<?php echo $end;?>: 10px; |
|
| 238 | + padding-<?php echo $start; ?>: 10px; |
|
| 239 | + padding-<?php echo $end; ?>: 10px; |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | #footer { |
| 243 | 243 | width: 100%; |
| 244 | - <?php echo $start;?>: 0; |
|
| 245 | - <?php echo $end;?>: 0; |
|
| 244 | + <?php echo $start; ?>: 0; |
|
| 245 | + <?php echo $end; ?>: 0; |
|
| 246 | 246 | bottom: 0; |
| 247 | 247 | position: absolute; |
| 248 | 248 | background: white; |
@@ -268,8 +268,8 @@ discard block |
||
| 268 | 268 | height: 100% !important; |
| 269 | 269 | position: relative; |
| 270 | 270 | min-width: 1000px; |
| 271 | - margin-<?php echo $start;?>: auto; |
|
| 272 | - margin-<?php echo $end;?>: auto; |
|
| 271 | + margin-<?php echo $start; ?>: auto; |
|
| 272 | + margin-<?php echo $end; ?>: auto; |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | div.device_info { |
@@ -289,8 +289,8 @@ discard block |
||
| 289 | 289 | position: fixed; |
| 290 | 290 | top: 0; |
| 291 | 291 | bottom: 0; |
| 292 | - <?php echo $start;?>: 0; |
|
| 293 | - <?php echo $end;?>: 0; |
|
| 292 | + <?php echo $start; ?>: 0; |
|
| 293 | + <?php echo $end; ?>: 0; |
|
| 294 | 294 | background-color: #000000; |
| 295 | 295 | opacity: 0.5; |
| 296 | 296 | z-index: 90; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | padding: 15px; |
| 317 | 317 | text-align: start; |
| 318 | 318 | width: 850px; |
| 319 | - <?php echo $start;?>: 100px; |
|
| 319 | + <?php echo $start; ?>: 100px; |
|
| 320 | 320 | top: 50px; |
| 321 | 321 | z-index: 100; |
| 322 | 322 | } |
@@ -325,15 +325,15 @@ discard block |
||
| 325 | 325 | position: absolute; |
| 326 | 326 | top: 0; |
| 327 | 327 | bottom: 0; |
| 328 | - <?php echo $start;?>: 0; |
|
| 329 | - <?php echo $end;?>: 0; |
|
| 328 | + <?php echo $start; ?>: 0; |
|
| 329 | + <?php echo $end; ?>: 0; |
|
| 330 | 330 | z-index: 100; |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | div#msgbox div { |
| 334 | 334 | position: fixed; |
| 335 | - <?php echo $start;?>: 0; |
|
| 336 | - <?php echo $end;?>: 0; |
|
| 335 | + <?php echo $start; ?>: 0; |
|
| 336 | + <?php echo $end; ?>: 0; |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | div#msgbox div div.graybox { |
@@ -347,13 +347,13 @@ discard block |
||
| 347 | 347 | div.graybox img { |
| 348 | 348 | display: block; |
| 349 | 349 | cursor: pointer; |
| 350 | - float: <?php echo $end;?>; |
|
| 350 | + float: <?php echo $end; ?>; |
|
| 351 | 351 | margin: 0px 0px 10px 10px; |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | img.icon { |
| 355 | - float: <?php echo $start;?>; |
|
| 356 | - margin-<?php echo $end;?>: 5px; |
|
| 355 | + float: <?php echo $start; ?>; |
|
| 356 | + margin-<?php echo $end; ?>: 5px; |
|
| 357 | 357 | margin-top: 3px; |
| 358 | 358 | } |
| 359 | 359 | |
@@ -408,15 +408,15 @@ discard block |
||
| 408 | 408 | div.ca-summary { |
| 409 | 409 | border: 1px dotted; |
| 410 | 410 | background-color: #ccccff; |
| 411 | - border-<?php echo $start;?>: 10px solid; |
|
| 412 | - border-<?php echo $start;?>-color: green; |
|
| 411 | + border-<?php echo $start; ?>: 10px solid; |
|
| 412 | + border-<?php echo $start; ?>-color: green; |
|
| 413 | 413 | padding: 2px; |
| 414 | - padding-<?php echo $start;?>: 8px; |
|
| 414 | + padding-<?php echo $start; ?>: 8px; |
|
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | span.edu_cat { |
| 418 | 418 | font-weight: bold; |
| 419 | - color: <?php echo $colour2;?>; |
|
| 419 | + color: <?php echo $colour2; ?>; |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | span.tooltip { |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | table.authrecord td { |
| 478 | - padding-<?php echo $end;?>: 10px; |
|
| 478 | + padding-<?php echo $end; ?>: 10px; |
|
| 479 | 479 | } |
| 480 | 480 | |
| 481 | 481 | p.MOTD { |
@@ -493,15 +493,15 @@ discard block |
||
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | .use_borders button { |
| 496 | - border-<?php echo $start;?>-style: outset; |
|
| 497 | - border-<?php echo $start;?>-width: 1px; |
|
| 498 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 496 | + border-<?php echo $start; ?>-style: outset; |
|
| 497 | + border-<?php echo $start; ?>-width: 1px; |
|
| 498 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 499 | 499 | border-top-style: outset; |
| 500 | 500 | border-top-width: 1px; |
| 501 | 501 | border-top-color: #8bbacb; |
| 502 | - border-<?php echo $end;?>-style: outset; |
|
| 503 | - border-<?php echo $end;?>-width: 2px; |
|
| 504 | - border-<?php echo $end;?>-color: #043d52; |
|
| 502 | + border-<?php echo $end; ?>-style: outset; |
|
| 503 | + border-<?php echo $end; ?>-width: 2px; |
|
| 504 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 505 | 505 | border-bottom-style: outset; |
| 506 | 506 | border-bottom-width: 2px; |
| 507 | 507 | border-bottom-color: #043d52; |
@@ -524,8 +524,8 @@ discard block |
||
| 524 | 524 | border-bottom-style:solid; |
| 525 | 525 | border-top-width:5px; |
| 526 | 526 | border-bottom-width:5px; |
| 527 | - border-color: <?php echo $colour1;?>; |
|
| 528 | - padding-<?php echo $start;?>:30px; |
|
| 527 | + border-color: <?php echo $colour1; ?>; |
|
| 528 | + padding-<?php echo $start; ?>:30px; |
|
| 529 | 529 | } |
| 530 | 530 | |
| 531 | 531 | .no_borders button.disabledDevice { |
@@ -541,13 +541,13 @@ discard block |
||
| 541 | 541 | } |
| 542 | 542 | |
| 543 | 543 | input { |
| 544 | - margin-<?php echo $end;?>: 5px; |
|
| 544 | + margin-<?php echo $end; ?>: 5px; |
|
| 545 | 545 | |
| 546 | 546 | } |
| 547 | 547 | |
| 548 | 548 | select { |
| 549 | 549 | vertical-align: middle; |
| 550 | - margin-<?php echo $start;?>: 10px; |
|
| 550 | + margin-<?php echo $start; ?>: 10px; |
|
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | td.notapplicable { |
@@ -580,8 +580,8 @@ discard block |
||
| 580 | 580 | |
| 581 | 581 | .signin_large { |
| 582 | 582 | vertical-align: top; |
| 583 | - padding-<?php echo $start;?>:20px; |
|
| 584 | - padding-<?php echo $end;?>:20px; |
|
| 583 | + padding-<?php echo $start; ?>:20px; |
|
| 584 | + padding-<?php echo $end; ?>:20px; |
|
| 585 | 585 | color: #bfd5dc; |
| 586 | 586 | font-size: 20px; |
| 587 | 587 | } |
@@ -594,34 +594,34 @@ discard block |
||
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | #close_button { |
| 597 | - background: <?php echo $colour2;?>; |
|
| 597 | + background: <?php echo $colour2; ?>; |
|
| 598 | 598 | color: #FFFFFF; |
| 599 | 599 | height: 23px; |
| 600 | - border-<?php echo $start;?>-style: inset; |
|
| 601 | - border-<?php echo $start;?>-width: 1px; |
|
| 602 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 600 | + border-<?php echo $start; ?>-style: inset; |
|
| 601 | + border-<?php echo $start; ?>-width: 1px; |
|
| 602 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 603 | 603 | border-top-style: inset; |
| 604 | 604 | border-top-width: 1px; |
| 605 | 605 | border-top-color: #8bbacb; |
| 606 | - border-<?php echo $end;?>-style: outset; |
|
| 607 | - border-<?php echo $end;?>-width: 2px; |
|
| 608 | - border-<?php echo $end;?>-color: #043d52; |
|
| 606 | + border-<?php echo $end; ?>-style: outset; |
|
| 607 | + border-<?php echo $end; ?>-width: 2px; |
|
| 608 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 609 | 609 | border-bottom-style: outset; |
| 610 | 610 | border-bottom-width: 2px; |
| 611 | 611 | border-bottom-color: #043d52; |
| 612 | - padding-<?php echo $start;?>: 5px; |
|
| 613 | - padding-<?php echo $end;?>: 5px; |
|
| 612 | + padding-<?php echo $start; ?>: 5px; |
|
| 613 | + padding-<?php echo $end; ?>: 5px; |
|
| 614 | 614 | padding-top: 1px; |
| 615 | 615 | padding-bottom: 1px; |
| 616 | 616 | position: relative; |
| 617 | - <?php echo $start;?>: 640px; |
|
| 617 | + <?php echo $start; ?>: 640px; |
|
| 618 | 618 | cursor:pointer; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | #loading_ico { |
| 622 | 622 | display: none; |
| 623 | 623 | position: absolute; |
| 624 | - <?php echo $start;?>: 200px; |
|
| 624 | + <?php echo $start; ?>: 200px; |
|
| 625 | 625 | top: 220px; |
| 626 | 626 | z-index: 200; |
| 627 | 627 | text-align: center; |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | z-index: 100; |
| 636 | 636 | position: absolute; |
| 637 | 637 | width: 700px; |
| 638 | - <?php echo $start;?>: 200px; |
|
| 638 | + <?php echo $start; ?>: 200px; |
|
| 639 | 639 | text-align: justify; |
| 640 | 640 | top: 200px; |
| 641 | 641 | box-shadow: 5px 5px 5px #666666; |
@@ -643,23 +643,23 @@ discard block |
||
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | #user_info { |
| 646 | - padding-<?php echo $start;?>: 30px; |
|
| 646 | + padding-<?php echo $start; ?>: 30px; |
|
| 647 | 647 | font-size: 11px; |
| 648 | 648 | font-weight: normal; |
| 649 | 649 | } |
| 650 | 650 | |
| 651 | 651 | #user_welcome { |
| 652 | 652 | background: #ffffff; |
| 653 | - padding-<?php echo $start;?>: 30px; |
|
| 653 | + padding-<?php echo $start; ?>: 30px; |
|
| 654 | 654 | padding-top: 20px; |
| 655 | - padding-<?php echo $end;?>: 180px; |
|
| 655 | + padding-<?php echo $end; ?>: 180px; |
|
| 656 | 656 | font-size: 12px; |
| 657 | 657 | font-weight: normal; |
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | #devices { |
| 661 | 661 | z-index:90; |
| 662 | - padding-<?php echo $start;?>: 30px; |
|
| 662 | + padding-<?php echo $start; ?>: 30px; |
|
| 663 | 663 | font-size: 11px; |
| 664 | 664 | font-weight: normal; |
| 665 | 665 | position: relative; |
@@ -667,15 +667,15 @@ discard block |
||
| 667 | 667 | |
| 668 | 668 | #profile_list { |
| 669 | 669 | width: 30em; |
| 670 | - padding-<?php echo $start;?>: 10px; |
|
| 671 | - padding-<?php echo $end;?>: 0px; |
|
| 672 | - background: <?php echo $colour2;?>; |
|
| 670 | + padding-<?php echo $start; ?>: 10px; |
|
| 671 | + padding-<?php echo $end; ?>: 0px; |
|
| 672 | + background: <?php echo $colour2; ?>; |
|
| 673 | 673 | color: white; |
| 674 | 674 | box-shadow: 10px 10px 5px #888888; |
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | #profile_redirect { |
| 678 | - padding-<?php echo $start;?>: 30px; |
|
| 678 | + padding-<?php echo $start; ?>: 30px; |
|
| 679 | 679 | padding-top: 20px; |
| 680 | 680 | font-size: 11px; |
| 681 | 681 | font-weight: normal; |
@@ -685,13 +685,13 @@ discard block |
||
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | #profiles { |
| 688 | - padding-<?php echo $start;?>: 30px; |
|
| 688 | + padding-<?php echo $start; ?>: 30px; |
|
| 689 | 689 | font-size: 11px; |
| 690 | 690 | padding-bottom: 10px |
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | #signin { |
| 694 | - padding-<?php echo $start;?>: 30px; |
|
| 694 | + padding-<?php echo $start; ?>: 30px; |
|
| 695 | 695 | padding-top: 10px; |
| 696 | 696 | } |
| 697 | 697 | |
@@ -715,8 +715,8 @@ discard block |
||
| 715 | 715 | font-size: 14px; |
| 716 | 716 | padding-top: 4px; |
| 717 | 717 | padding-bottom: 12px; |
| 718 | - padding-<?php echo $start;?>: 30px; |
|
| 719 | - background: <?php echo $colour1;?>; |
|
| 718 | + padding-<?php echo $start; ?>: 30px; |
|
| 719 | + background: <?php echo $colour1; ?>; |
|
| 720 | 720 | text-align: start; |
| 721 | 721 | text-shadow: 10px 10px 5px #888888; |
| 722 | 722 | } |
@@ -726,9 +726,9 @@ discard block |
||
| 726 | 726 | border-bottom-style:solid; |
| 727 | 727 | border-top-width:5px; |
| 728 | 728 | border-bottom-width:5px; |
| 729 | - border-color: <?php echo $colour1;?>; |
|
| 730 | - padding-<?php echo $start;?>:30px; |
|
| 731 | - color: <?php echo $colour2;?>; |
|
| 729 | + border-color: <?php echo $colour1; ?>; |
|
| 730 | + padding-<?php echo $start; ?>:30px; |
|
| 731 | + color: <?php echo $colour2; ?>; |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | #heading h1 { |
@@ -743,11 +743,11 @@ discard block |
||
| 743 | 743 | |
| 744 | 744 | #welcome { |
| 745 | 745 | padding: 20px; |
| 746 | - padding-<?php echo $start;?>: 30px; |
|
| 746 | + padding-<?php echo $start; ?>: 30px; |
|
| 747 | 747 | text-align: justify; |
| 748 | 748 | border-bottom-style:solid; |
| 749 | 749 | border-bottom-width:5px; |
| 750 | - border-color: <?php echo $colour1;?>; |
|
| 750 | + border-color: <?php echo $colour1; ?>; |
|
| 751 | 751 | font-size: 11px; |
| 752 | 752 | font-weight: normal; |
| 753 | 753 | } |
@@ -756,14 +756,14 @@ discard block |
||
| 756 | 756 | #main_menu_info { |
| 757 | 757 | position: relative; |
| 758 | 758 | top: 15px; |
| 759 | - <?php echo $start;?>: 0px; |
|
| 760 | - padding:10px; padding-<?php echo $start;?>:20px; padding-<?php echo $end;?>:20px; |
|
| 759 | + <?php echo $start; ?>: 0px; |
|
| 760 | + padding:10px; padding-<?php echo $start; ?>:20px; padding-<?php echo $end; ?>:20px; |
|
| 761 | 761 | background: #f0f0f0; |
| 762 | 762 | border: 1px solid #dddddd; |
| 763 | - margin-<?php echo $start;?>: 25px; |
|
| 764 | - padding-<?php echo $start;?>: 25px; |
|
| 765 | - margin-<?php echo $end;?>: 25px; |
|
| 766 | - padding-<?php echo $end;?>: 25px; |
|
| 763 | + margin-<?php echo $start; ?>: 25px; |
|
| 764 | + padding-<?php echo $start; ?>: 25px; |
|
| 765 | + margin-<?php echo $end; ?>: 25px; |
|
| 766 | + padding-<?php echo $end; ?>: 25px; |
|
| 767 | 767 | padding-bottom: 10px; |
| 768 | 768 | vertical-align: top; |
| 769 | 769 | box-shadow: 5px 5px 5px #666666; |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | |
| 795 | 795 | #faq { |
| 796 | 796 | padding: 20px; |
| 797 | - color: <?php echo $colour2;?>; |
|
| 797 | + color: <?php echo $colour2; ?>; |
|
| 798 | 798 | background: #ffffff; |
| 799 | 799 | } |
| 800 | 800 | |
@@ -812,7 +812,7 @@ discard block |
||
| 812 | 812 | #idp_logo { |
| 813 | 813 | display:none; |
| 814 | 814 | position:absolute; |
| 815 | - <?php echo $end;?>:30px; |
|
| 815 | + <?php echo $end; ?>:30px; |
|
| 816 | 816 | max-height:150px; |
| 817 | 817 | max-width:150px; |
| 818 | 818 | padding-top:10px; |
@@ -835,18 +835,18 @@ discard block |
||
| 835 | 835 | #slides img { |
| 836 | 836 | position: absolute; |
| 837 | 837 | top: 145px; |
| 838 | - <?php echo $end;?>: 60px; |
|
| 838 | + <?php echo $end; ?>: 60px; |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | #slides span { |
| 842 | 842 | position: absolute; |
| 843 | - <?php echo $start;?>: 180px; |
|
| 843 | + <?php echo $start; ?>: 180px; |
|
| 844 | 844 | z-index: 20; |
| 845 | 845 | } |
| 846 | 846 | |
| 847 | 847 | #line1 { |
| 848 | 848 | top:145px; |
| 849 | - color: <?php echo $colour2;?>; |
|
| 849 | + color: <?php echo $colour2; ?>; |
|
| 850 | 850 | font-size:20px; |
| 851 | 851 | } |
| 852 | 852 | |
@@ -858,7 +858,7 @@ discard block |
||
| 858 | 858 | |
| 859 | 859 | #line3 { |
| 860 | 860 | top:245px; |
| 861 | - <?php echo $start;?>: 200px; |
|
| 861 | + <?php echo $start; ?>: 200px; |
|
| 862 | 862 | color: maroon; |
| 863 | 863 | font-size:25px; |
| 864 | 864 | } |
@@ -887,16 +887,16 @@ discard block |
||
| 887 | 887 | height:100%; |
| 888 | 888 | border-spacing:0; |
| 889 | 889 | border-collapse:collapse; |
| 890 | - padding-<?php echo $start;?>:200px; |
|
| 890 | + padding-<?php echo $start; ?>:200px; |
|
| 891 | 891 | padding-top:10px; |
| 892 | 892 | } |
| 893 | 893 | |
| 894 | 894 | #front_page_leftmenu { |
| 895 | - border-<?php echo $end;?>:solid; |
|
| 896 | - border-color: <?php echo $colour1;?>; |
|
| 895 | + border-<?php echo $end; ?>:solid; |
|
| 896 | + border-color: <?php echo $colour1; ?>; |
|
| 897 | 897 | border-width:5px; |
| 898 | 898 | min-height:400px; |
| 899 | - padding-<?php echo $start;?>: 10px; |
|
| 899 | + padding-<?php echo $start; ?>: 10px; |
|
| 900 | 900 | vertical-align:top; |
| 901 | 901 | width:110px; |
| 902 | 902 | padding-top:30px; |
@@ -906,8 +906,8 @@ discard block |
||
| 906 | 906 | vertical-align: top; |
| 907 | 907 | height:280px; |
| 908 | 908 | background: #fff; |
| 909 | - padding-<?php echo $start;?>: 20px; |
|
| 910 | - padding-<?php echo $end;?>: 20px; |
|
| 909 | + padding-<?php echo $start; ?>: 20px; |
|
| 910 | + padding-<?php echo $end; ?>: 20px; |
|
| 911 | 911 | } |
| 912 | 912 | |
| 913 | 913 | #user_button_td { |
@@ -918,11 +918,11 @@ discard block |
||
| 918 | 918 | } |
| 919 | 919 | |
| 920 | 920 | a:link { |
| 921 | - color:<?php echo $colour2;?>; |
|
| 921 | + color:<?php echo $colour2; ?>; |
|
| 922 | 922 | } |
| 923 | 923 | |
| 924 | 924 | a:visited { |
| 925 | - color:<?php echo $colour2;?>; |
|
| 925 | + color:<?php echo $colour2; ?>; |
|
| 926 | 926 | } |
| 927 | 927 | |
| 928 | 928 | a:hover { |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | } |
| 931 | 931 | |
| 932 | 932 | a:active { |
| 933 | - color:<?php echo $colour2;?>; |
|
| 933 | + color:<?php echo $colour2; ?>; |
|
| 934 | 934 | } |
| 935 | 935 | |
| 936 | 936 | .comment { |
@@ -961,14 +961,14 @@ discard block |
||
| 961 | 961 | table.user_overview th { |
| 962 | 962 | text-align: start; |
| 963 | 963 | background: #f0f0f0; |
| 964 | - padding-<?php echo $start;?>: 4px; |
|
| 965 | - padding-<?php echo $end;?>: 4px; |
|
| 964 | + padding-<?php echo $start; ?>: 4px; |
|
| 965 | + padding-<?php echo $end; ?>: 4px; |
|
| 966 | 966 | } |
| 967 | 967 | |
| 968 | 968 | table.user_overview td { |
| 969 | 969 | border-top-style: none; |
| 970 | - padding-<?php echo $start;?>: 4px; |
|
| 971 | - padding-<?php echo $end;?>: 4px; |
|
| 970 | + padding-<?php echo $start; ?>: 4px; |
|
| 971 | + padding-<?php echo $end; ?>: 4px; |
|
| 972 | 972 | vertical-align: middle; |
| 973 | 973 | height: 28px; |
| 974 | 974 | } |
@@ -985,14 +985,14 @@ discard block |
||
| 985 | 985 | .download_button_text { |
| 986 | 986 | width: 380px; |
| 987 | 987 | position:absolute; |
| 988 | - <?php echo $end;?>: 5px; |
|
| 988 | + <?php echo $end; ?>: 5px; |
|
| 989 | 989 | padding-top:0px; |
| 990 | 990 | } |
| 991 | 991 | |
| 992 | 992 | #download_info { |
| 993 | 993 | background: #f0f0f0; |
| 994 | - padding-<?php echo $start;?>: 20px; |
|
| 995 | - padding-<?php echo $end;?>: 20px; |
|
| 994 | + padding-<?php echo $start; ?>: 20px; |
|
| 995 | + padding-<?php echo $end; ?>: 20px; |
|
| 996 | 996 | padding-top:3px; |
| 997 | 997 | padding-bottom:3px; |
| 998 | 998 | } |
@@ -168,27 +168,27 @@ discard block |
||
| 168 | 168 | { |
| 169 | 169 | // it could match CN or sAN:DNS, we don't care which |
| 170 | 170 | if (isset($this->TLS_CA_checks_result[$host]['certdata']['subject'])) { |
| 171 | - $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . |
|
| 172 | - " against Subject: " . $this->TLS_CA_checks_result[$host]['certdata']['subject']); |
|
| 171 | + $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName. |
|
| 172 | + " against Subject: ".$this->TLS_CA_checks_result[$host]['certdata']['subject']); |
|
| 173 | 173 | // we are checking against accidental misconfig, not attacks, so loosely checking against end of string is appropriate |
| 174 | - if (preg_match("/CN=" . $this->expectedName . "/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) { |
|
| 174 | + if (preg_match("/CN=".$this->expectedName."/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) { |
|
| 175 | 175 | return TRUE; |
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | if (isset($this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'])) { |
| 179 | - $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . " against sANs: "); |
|
| 179 | + $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName." against sANs: "); |
|
| 180 | 180 | $this->loggerInstance->debug(4, $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname']); |
| 181 | 181 | $testNames = $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname']; |
| 182 | 182 | if (!is_array($testNames)) { |
| 183 | 183 | $testNames = [$testNames]; |
| 184 | 184 | } |
| 185 | 185 | foreach ($testNames as $oneName) { |
| 186 | - if (preg_match("/" . $this->expectedName . "/", $oneName) === 1) { |
|
| 186 | + if (preg_match("/".$this->expectedName."/", $oneName) === 1) { |
|
| 187 | 187 | return TRUE; |
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | - $this->loggerInstance->debug(3, "Tried to check expected server name " . $this->expectedName . " but neither CN nor sANs matched."); |
|
| 191 | + $this->loggerInstance->debug(3, "Tried to check expected server name ".$this->expectedName." but neither CN nor sANs matched."); |
|
| 192 | 192 | |
| 193 | 193 | $this->TLS_CA_checks_result[$host]['cert_oddity'] = RADIUSTests::CERTPROB_DYN_SERVER_NAME_MISMATCH; |
| 194 | 194 | return FALSE; |
@@ -218,9 +218,9 @@ discard block |
||
| 218 | 218 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['status'] = $cert['status']; |
| 219 | 219 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['message'] = $this->TLS_certkeys[$cert['status']]; |
| 220 | 220 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['expected'] = $cert['expected']; |
| 221 | - $add = ' -cert ' . ROOT . '/config/cli-certs/' . $cert['public'] . ' -key ' . ROOT . '/config/cli-certs/' . $cert['private']; |
|
| 222 | - if (!file_exists(ROOT . '/config/cli-certs/' . $cert['public']) ||!file_exists(ROOT . |
|
| 223 | - '/config/cli-certs/' . $cert['private'])) { |
|
| 221 | + $add = ' -cert '.ROOT.'/config/cli-certs/'.$cert['public'].' -key '.ROOT.'/config/cli-certs/'.$cert['private']; |
|
| 222 | + if (!file_exists(ROOT.'/config/cli-certs/'.$cert['public']) || !file_exists(ROOT. |
|
| 223 | + '/config/cli-certs/'.$cert['private'])) { |
|
| 224 | 224 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['finalerror'] = 2; |
| 225 | 225 | continue; |
| 226 | 226 | } |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | if (in_array("TLS1.3", $protocols) && count($protocols) > 1) { |
| 232 | 232 | $prot .= ' -no_tls1_3'; |
| 233 | 233 | } |
| 234 | - $add .= ' ' . $prot; |
|
| 234 | + $add .= ' '.$prot; |
|
| 235 | 235 | $opensslbabble = $this->execOpensslClient($host, $add, $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]); |
| 236 | 236 | $res = $this->opensslClientsResult($host, $opensslbabble, $this->TLS_clients_checks_result, $type, $k); |
| 237 | 237 | if ($cert['expected'] == 'PASS') { |
@@ -273,11 +273,11 @@ discard block |
||
| 273 | 273 | // but code analysers want this more explicit, so here is this extra |
| 274 | 274 | // call to escapeshellarg() |
| 275 | 275 | $escapedHost = escapeshellarg($host); |
| 276 | - $this->loggerInstance->debug(4, \config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1\n"); |
|
| 276 | + $this->loggerInstance->debug(4, \config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1\n"); |
|
| 277 | 277 | $time_start = microtime(true); |
| 278 | 278 | $opensslbabble = []; |
| 279 | 279 | $result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures |
| 280 | - exec(\config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result); |
|
| 280 | + exec(\config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result); |
|
| 281 | 281 | $time_stop = microtime(true); |
| 282 | 282 | $testresults['time_millisec'] = floor(($time_stop - $time_start) * 1000); |
| 283 | 283 | $testresults['returncode'] = $result; |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | private function propertyCheckPolicy($cert) |
| 400 | 400 | { |
| 401 | 401 | $oids = []; |
| 402 | - if (isset($cert['extensions']['certificatePolicies']) && $cert['extensions']['certificatePolicies']) { |
|
| 402 | + if (isset($cert['extensions']['certificatePolicies']) && $cert['extensions']['certificatePolicies']) { |
|
| 403 | 403 | foreach (\config\Diagnostics::RADIUSTESTS['TLS-acceptableOIDs'] as $key => $oid) { |
| 404 | 404 | if (preg_match("/Policy: $oid/", $cert['extensions']['certificatePolicies'])) { |
| 405 | 405 | $oids[$key] = $oid; |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | * License: see the web/copyright.php file in the file structure |
| 9 | 9 | * ****************************************************************************** |
| 10 | 10 | */ |
| 11 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 11 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * The sctipt will be called from crontab |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | |
| 31 | -while ( $row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) { |
|
| 31 | +while ($row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) { |
|
| 32 | 32 | $profileId = $row->profile_id; |
| 33 | 33 | $profile = \core\ProfileFactory::instantiate($profileId); |
| 34 | 34 | $res = $profile->openroamingRedinessTest(); |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | * update the local copy |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 27 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 28 | 28 | setlocale(LC_CTYPE, "en_US.UTF-8"); |
| 29 | 29 | |
| 30 | 30 | class updateFromMonitor { |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | $tmp_table = 'tmp_'.$table_name; |
| 114 | 114 | if ($this->tablesource[$table_name] == 'eduroam') { |
| 115 | 115 | $this->db_local->select_db('monitor_copy'); |
| 116 | - } elseif($this->tablesource[$table_name] == 'eduroamv2') { |
|
| 116 | + } elseif ($this->tablesource[$table_name] == 'eduroamv2') { |
|
| 117 | 117 | $this->db_local->select_db('eduroamv2'); |
| 118 | 118 | } |
| 119 | 119 | $this->db_local->query("CREATE TEMPORARY TABLE $tmp_table SELECT * FROM $table LIMIT 0"); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $this->db->query("SET NAMES 'utf8'"); |
| 123 | 123 | $this->db_local->query("SET NAMES 'utf8mb4'"); |
| 124 | 124 | $result = $this->db->query("SELECT * FROM $table"); |
| 125 | - $queryFields = implode(',', array_column($this->fields[$table_name],0)); |
|
| 125 | + $queryFields = implode(',', array_column($this->fields[$table_name], 0)); |
|
| 126 | 126 | while ($row = $result->fetch_assoc()) { |
| 127 | 127 | $v = []; |
| 128 | 128 | foreach ($this->fields[$table_name] as $field) { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | - $queryValues = implode(',',$v); |
|
| 143 | + $queryValues = implode(',', $v); |
|
| 144 | 144 | $query = "INSERT INTO $tmp_table (".$queryFields.") VALUES (".$queryValues.")"; |
| 145 | 145 | $this->db_local->query($query); |
| 146 | 146 | } |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $tmp_table = 'tmp_'.$table_name; |
| 153 | 153 | if ($this->tablesource[$table_name] == 'eduroam') { |
| 154 | 154 | $this->db_local->select_db('monitor_copy'); |
| 155 | - } elseif($this->tablesource[$table_name] == 'eduroamv2') { |
|
| 155 | + } elseif ($this->tablesource[$table_name] == 'eduroamv2') { |
|
| 156 | 156 | $this->db_local->select_db('eduroamv2'); |
| 157 | 157 | } |
| 158 | 158 | $this->db_local->query("SET NAMES 'utf8mb4'"); |
@@ -161,9 +161,9 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | private function escape($inp) { |
| 164 | - $out=str_replace('\\','\\\\',$inp); |
|
| 165 | - $out=str_replace('"','\"',$out); |
|
| 166 | - $out=str_replace('?','\?',$out); |
|
| 164 | + $out = str_replace('\\', '\\\\', $inp); |
|
| 165 | + $out = str_replace('"', '\"', $out); |
|
| 166 | + $out = str_replace('?', '\?', $out); |
|
| 167 | 167 | $out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)'; |
| 168 | 168 | return($out); |
| 169 | 169 | } |
@@ -162,7 +162,7 @@ |
||
| 162 | 162 | ?> |
| 163 | 163 | <div id="tabs-3"> |
| 164 | 164 | <!--<button id="run_d_tests" onclick="run_dynamic()"><?php echo _("Repeat dynamic connectivity tests") ?></button>--> |
| 165 | - <?php print $realmTests->printDynamic();?> |
|
| 165 | + <?php print $realmTests->printDynamic(); ?> |
|
| 166 | 166 | |
| 167 | 167 | </div> |
| 168 | 168 | <?php |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | <table><tr> |
| 293 | 293 | <td class='icon_td'>"; |
| 294 | 294 | $out[] = "<img src='".$this->stateIcons[$this->globalLevelStatic]."' id='main_static_ico' class='icon'></td><td id='main_static_result'>". |
| 295 | - $this->globalInfo[$this->globalLevelStatic].' '. _("See the appropriate tab for details.").'</td> |
|
| 295 | + $this->globalInfo[$this->globalLevelStatic].' '._("See the appropriate tab for details.").'</td> |
|
| 296 | 296 | </tr></table>'; |
| 297 | 297 | if ($this->naptr > 0) { |
| 298 | 298 | $out[] = "<hr><strong>"._("Dynamic connectivity tests")."</strong> |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | <td class='icon_td'><img src='".$this->stateIcons[$result->level]."' id='src".$hostindex."_img'></td> |
| 325 | 325 | <td id='src$hostindex' colspan=2> |
| 326 | 326 | "; |
| 327 | - $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf (_("elapsed time: %sms."), $result->time_millisec).'<div>'.$result->message.'</div>'; |
|
| 327 | + $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf(_("elapsed time: %sms."), $result->time_millisec).'<div>'.$result->message.'</div>'; |
|
| 328 | 328 | |
| 329 | 329 | if ($result->level > \core\common\Entity::L_OK && property_exists($result, 'cert_oddities')) { |
| 330 | 330 | foreach ($result->cert_oddities as $oddities) { |
@@ -341,16 +341,16 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | if ($result->server_cert->extensions) { |
| 344 | - $certdesc .= '<li>' . _('Extensions') . '<ul>'; |
|
| 344 | + $certdesc .= '<li>'._('Extensions').'<ul>'; |
|
| 345 | 345 | foreach ($result->server_cert->extensions as $ekey => $eval) { |
| 346 | - $certdesc .= '<li>' . $ekey . ': ' . $eval; |
|
| 346 | + $certdesc .= '<li>'.$ekey.': '.$eval; |
|
| 347 | 347 | } |
| 348 | 348 | $certdesc .= '</ul>'; |
| 349 | 349 | } |
| 350 | 350 | $certdesc .= '</ul>'; |
| 351 | 351 | $more .= '<span class="morecontent"><span>'.$certdesc. |
| 352 | 352 | '</span> <a href="" class="morelink">'._("show server certificate details").'»</a></span></td></tr>'; |
| 353 | - $out[] = $more . '</ul>'; |
|
| 353 | + $out[] = $more.'</ul>'; |
|
| 354 | 354 | } |
| 355 | 355 | $out[] = "</td></tr></table></ul>"; |
| 356 | 356 | } |
@@ -373,10 +373,10 @@ discard block |
||
| 373 | 373 | if (isset($this->protocolsMap[$capath->IP]) && $this->protocolsMap[$capath->IP] != '') { |
| 374 | 374 | $prots = explode(';', $this->protocolsMap[$capath->IP]); |
| 375 | 375 | if (!empty($prots)) { |
| 376 | - $capathtest[] = ' ' . _("supported TLS protocols: "); |
|
| 376 | + $capathtest[] = ' '._("supported TLS protocols: "); |
|
| 377 | 377 | $capathtest[] = implode(', ', $prots); |
| 378 | 378 | if (!in_array("TLS1.3", $prots)) { |
| 379 | - $capathtest[] = ' ' . '<font color="red">' . _("not supported: ") . 'TLS1.3</font>'; |
|
| 379 | + $capathtest[] = ' '.'<font color="red">'._("not supported: ").'TLS1.3</font>'; |
|
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | } |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | if ($capath->certdata->validTo) { |
| 400 | 400 | $certdesc .= '<li>'.$this->certFields['validTo'].' '. |
| 401 | 401 | date_create_from_format('ymdGis', |
| 402 | - substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s'). ' UTC'; |
|
| 402 | + substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s').' UTC'; |
|
| 403 | 403 | } |
| 404 | 404 | if ($capath->certdata->extensions) { |
| 405 | 405 | if ($capath->certdata->extensions->subjectaltname) { |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | } else { |
| 423 | 423 | $certdesc = '<br>'; |
| 424 | 424 | } |
| 425 | - $capathtest[] = '<div>'.($capath->message!='' ? $capath->message : _('Test failed')).'</div>'.$more; |
|
| 425 | + $capathtest[] = '<div>'.($capath->message != '' ? $capath->message : _('Test failed')).'</div>'.$more; |
|
| 426 | 426 | $capathtest[] = '</td> |
| 427 | 427 | </tr> |
| 428 | 428 | </table>'; |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | $srefused = 0; |
| 450 | 450 | $cliinfo = ''; |
| 451 | 451 | $cliinfo .= '<li>'._('Client certificate').' <b>'.$ca->clientcertinfo->from. |
| 452 | - '</b>'.', '.$ca->clientcertinfo->message . |
|
| 452 | + '</b>'.', '.$ca->clientcertinfo->message. |
|
| 453 | 453 | '<br> (CA: '.$ca->clientcertinfo->issuer.')<ul>'; |
| 454 | 454 | foreach ($ca->certificate as $certificate) { |
| 455 | 455 | if ($certificate->returncode == \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) { |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | } else { |
| 516 | 516 | $cliinfo = _('Test failed'); |
| 517 | 517 | $clientstest[] = "<table><tr><td class='icon_td' id='srcclient".$hostindex."_img'><img src='". |
| 518 | - $this->stateIcons[\core\common\Entity::L_WARN]."'></td>" . |
|
| 518 | + $this->stateIcons[\core\common\Entity::L_WARN]."'></td>". |
|
| 519 | 519 | "<td id='srcclient$hostindex'>$cliinfo</td></tr></table>"; |
| 520 | 520 | } |
| 521 | 521 | } else { |
@@ -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(); |
@@ -105,10 +105,10 @@ discard block |
||
| 105 | 105 | $fed = $validator->existingFederation($_POST['NRO-list']); |
| 106 | 106 | $country = strtoupper($fed->tld); |
| 107 | 107 | $DN[] = "C=$country"; |
| 108 | - $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]); |
|
| 108 | + $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]); |
|
| 109 | 109 | $serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld); |
| 110 | 110 | $serverList = explode(",", array_key_first($serverInfo)); |
| 111 | - $DN[] = "CN=" . $serverList[0]; |
|
| 111 | + $DN[] = "CN=".$serverList[0]; |
|
| 112 | 112 | $policies[] = "eduroam IdP"; |
| 113 | 113 | $policies[] = "eduroam SP"; |
| 114 | 114 | $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"]; |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 134 | 134 | $serverList = explode(",", $serverInfo["servers"]); |
| 135 | - $DN[] = "CN=" . $serverList[0]; |
|
| 135 | + $DN[] = "CN=".$serverList[0]; |
|
| 136 | 136 | switch ($serverInfo["type"]) { |
| 137 | 137 | case core\IdP::TYPE_IDPSP: |
| 138 | 138 | $policies[] = "eduroam IdP"; |
@@ -152,12 +152,12 @@ discard block |
||
| 152 | 152 | default: |
| 153 | 153 | throw new Exception("Sorry: Unknown level of issuance requested."); |
| 154 | 154 | } |
| 155 | - echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
|
| 155 | + echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties"); |
|
| 156 | 156 | echo "<ul>"; |
| 157 | - echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
|
| 158 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN) . "</li>"; |
|
| 159 | - echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
|
| 160 | - echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
|
| 157 | + echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>"; |
|
| 158 | + echo "<li>"._("Distinguished Name: ").implode(", ", $DN)."</li>"; |
|
| 159 | + echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>"; |
|
| 160 | + echo "<li>"._("Requester Contact Details: ").$firstName." <".$firstMail.">"."</li>"; |
|
| 161 | 161 | echo "</ul></p>"; |
| 162 | 162 | |
| 163 | 163 | $vettedCsr = $validator->string($_POST['CSR'], true); |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $loggerInstance->debug(2, $DN, "CERT DN: ", "\n"); |
| 174 | 174 | // our certs can be good for max 5 years |
| 175 | 175 | $fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays); |
| 176 | - echo "<p>" . _("The certificate was requested.") . "</p>"; |
|
| 176 | + echo "<p>"._("The certificate was requested.")."</p>"; |
|
| 177 | 177 | ?> |
| 178 | 178 | <form action="overview_certificates.php" method="GET"> |
| 179 | 179 | <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button> |
@@ -191,23 +191,23 @@ discard block |
||
| 191 | 191 | switch (count($feds)) { |
| 192 | 192 | case 0: |
| 193 | 193 | echo "<div>"; |
| 194 | - 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.")); |
|
| 194 | + 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.")); |
|
| 195 | 195 | echo "</div>"; |
| 196 | 196 | break; |
| 197 | 197 | case 1: |
| 198 | - echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 199 | - echo " <strong>" . $cat->knownFederations[$feds[0]->tld] . "</strong>"; |
|
| 200 | - echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>'; |
|
| 198 | + echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 199 | + echo " <strong>".$cat->knownFederations[$feds[0]->tld]."</strong>"; |
|
| 200 | + echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>'; |
|
| 201 | 201 | break; |
| 202 | 202 | default: |
| 203 | - echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 203 | + echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 204 | 204 | ?> |
| 205 | 205 | <select name="NRO-list" id="NRO-list"> |
| 206 | 206 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 207 | 207 | <?php |
| 208 | 208 | foreach ($feds as $oneFed) { |
| 209 | 209 | #echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld] . "</option>"; |
| 210 | - echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>"; |
|
| 210 | + echo '<option value="AAA'.strtoupper($oneFed->tld).'">'.$oneIdP["names"][$langObject->getLang()]."</option>"; |
|
| 211 | 211 | |
| 212 | 212 | } |
| 213 | 213 | ?> |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | ?> |
| 219 | 219 | <script> |
| 220 | 220 | var instservers = []; |
| 221 | - var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo));?>'; |
|
| 221 | + var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?>'; |
|
| 222 | 222 | <?php |
| 223 | 223 | $allIdPs = []; |
| 224 | 224 | foreach ($allAuthorizedFeds as $oneFed) { |
| 225 | 225 | foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) { |
| 226 | - $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["names"][$langObject->getLang()]; |
|
| 227 | - echo "instservers['" . $id . "']='" . str_replace(",", ", ", $oneIdP["servers"]) . "';\n"; |
|
| 226 | + $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["names"][$langObject->getLang()]; |
|
| 227 | + echo "instservers['".$id."']='".str_replace(",", ", ", $oneIdP["servers"])."';\n"; |
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | ?> |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 253 | 253 | <?php |
| 254 | 254 | foreach ($allIdPs as $id => $name) { |
| 255 | - echo '<option value="' . $id . '">' . $name . "</option>"; |
|
| 255 | + echo '<option value="'.$id.'">'.$name."</option>"; |
|
| 256 | 256 | } |
| 257 | 257 | ?> |
| 258 | 258 | </select> |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | <?php |
| 262 | 262 | echo _('According to the above settings you will receive') |
| 263 | 263 | ?> |
| 264 | - <span id='certlevel'><?php echo _('NRO level certificate');?></span> |
|
| 264 | + <span id='certlevel'><?php echo _('NRO level certificate'); ?></span> |
|
| 265 | 265 | |
| 266 | 266 | </span>for server names: |
| 267 | 267 | <span id='serversinfo'><?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?></span> |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | <?php |
| 270 | 270 | } else { |
| 271 | 271 | echo "<div>"; |
| 272 | - 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); |
|
| 272 | + 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); |
|
| 273 | 273 | echo "</div>"; |
| 274 | 274 | } |
| 275 | 275 | ?> |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | <h2><?php echo _("2. CSR generation"); ?></h2> |
| 280 | 280 | <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p> |
| 281 | 281 | <?php |
| 282 | - echo "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"; |
|
| 282 | + echo "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"; |
|
| 283 | 283 | ?> |
| 284 | 284 | <h2><?php echo _("3. Submission"); ?></h2> |
| 285 | 285 | <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/> |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /* |
| 21 | 21 | * Class autoloader invocation, should be included prior to any other code at the entry points to the application |
| 22 | 22 | */ |
| 23 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 23 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 24 | 24 | |
| 25 | 25 | $auth = new \web\lib\admin\Authentication(); |
| 26 | 26 | $auth->authenticate(); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $fed = new \core\Federation($inst->federation); |
| 54 | 54 | $allowSb = $fed->getAttributes("fed:silverbullet"); |
| 55 | 55 | if (count($allowSb) == 0) { |
| 56 | - throw new Exception("We were told to create a new SB profile, but this " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " does not allow SB at all!"); |
|
| 56 | + throw new Exception("We were told to create a new SB profile, but this ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." does not allow SB at all!"); |
|
| 57 | 57 | } |
| 58 | 58 | // okay, new SB profiles are allowed. |
| 59 | 59 | // but is there a support:email attribute on inst level? |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | // Create one. |
| 65 | 65 | $newProfile = $inst->newProfile(core\AbstractProfile::PROFILETYPE_SILVERBULLET); |
| 66 | 66 | // and modify the REQUEST_URI to add the new profile ID |
| 67 | - $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier; |
|
| 67 | + $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier; |
|
| 68 | 68 | $_GET['profile_id'] = $newProfile->identifier; |
| 69 | 69 | $profile = $newProfile; |
| 70 | 70 | } else { |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | if (isset($_POST['command'])) { |
| 90 | 90 | switch ($_POST['command']) { |
| 91 | 91 | case \web\lib\common\FormElements::BUTTON_CLOSE: |
| 92 | - header("Location: overview_org.php?inst_id=" . $inst->identifier); |
|
| 92 | + header("Location: overview_org.php?inst_id=".$inst->identifier); |
|
| 93 | 93 | break; |
| 94 | 94 | case \web\lib\common\FormElements::BUTTON_TERMSOFUSE_ACCEPTED: |
| 95 | 95 | if (isset($_POST['agreement']) && $_POST['agreement'] == 'true') { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | break; |
| 133 | 133 | } |
| 134 | 134 | $properName = $validator->syntaxConformUser($elements[0]); |
| 135 | - $properDate = new DateTime($elements[1] . " 00:00:00"); |
|
| 135 | + $properDate = new DateTime($elements[1]." 00:00:00"); |
|
| 136 | 136 | $numberOfActivations = $elements[2] ?? 5; |
| 137 | 137 | $number = $validator->integer($numberOfActivations); |
| 138 | 138 | if ($number === FALSE) { // invalid input received, default to sane |
@@ -235,18 +235,18 @@ discard block |
||
| 235 | 235 | // warn and ask for confirmation unless already confirmed |
| 236 | 236 | if (!isset($_POST['insecureconfirm']) || $_POST['insecureconfirm'] != "CONFIRM") { |
| 237 | 237 | echo $deco->pageheader(_("Insecure mail domain!"), "ADMIN-IDP-USERS"); |
| 238 | - echo "<p>" . sprintf(_("The mail domain of the mail address <strong>%s</strong> is not secure: some or all of the mail servers are not accepting encrypted connections (no consistent support for STARTTLS)."), $properEmail) . "</p>"; |
|
| 239 | - echo "<p>" . _("The invitation would need to be sent in cleartext across the internet, and can possibly be read and abused by anyone in transit.") . "</p>"; |
|
| 240 | - echo "<p>" . _("Do you want the system to send this mail anyway?") . "</p>"; |
|
| 238 | + echo "<p>".sprintf(_("The mail domain of the mail address <strong>%s</strong> is not secure: some or all of the mail servers are not accepting encrypted connections (no consistent support for STARTTLS)."), $properEmail)."</p>"; |
|
| 239 | + echo "<p>"._("The invitation would need to be sent in cleartext across the internet, and can possibly be read and abused by anyone in transit.")."</p>"; |
|
| 240 | + echo "<p>"._("Do you want the system to send this mail anyway?")."</p>"; |
|
| 241 | 241 | echo $formtext; |
| 242 | - echo "<button type='submit' class='delete'>" . _("DO NOT SEND") . "</button>"; |
|
| 242 | + echo "<button type='submit' class='delete'>"._("DO NOT SEND")."</button>"; |
|
| 243 | 243 | echo "</form>"; |
| 244 | 244 | echo $formtext; |
| 245 | - echo "<input type='hidden' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'</>"; |
|
| 245 | + echo "<input type='hidden' name='command' value='".\web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'</>"; |
|
| 246 | 246 | echo "<input type='hidden' name='address' value='$properEmail'</>"; |
| 247 | - echo "<input type='hidden' name='token' value='" . $invitationObject->invitationTokenString . "'</>"; |
|
| 247 | + echo "<input type='hidden' name='token' value='".$invitationObject->invitationTokenString."'</>"; |
|
| 248 | 248 | echo "<input type='hidden' name='insecureconfirm' value='CONFIRM'/>"; |
| 249 | - echo "<button type='submit'>" . _("Send anyway.") . "</button>"; |
|
| 249 | + echo "<button type='submit'>"._("Send anyway.")."</button>"; |
|
| 250 | 250 | echo "</form>"; |
| 251 | 251 | echo $deco->footer(); |
| 252 | 252 | exit; |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | $activeUsers = $profile->listActiveUsers(); |
| 298 | 298 | |
| 299 | 299 | |
| 300 | -echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME )); |
|
| 300 | +echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME)); |
|
| 301 | 301 | |
| 302 | 302 | ?> |
| 303 | 303 | <script src='js/option_expand.js' type='text/javascript'></script> |
@@ -337,12 +337,12 @@ discard block |
||
| 337 | 337 | <img src='../resources/images/icons/loading51.gif' id='spin' alt='loading...' style='position:absolute;left: 50%; top: 50%; transform: translate(-100px, -50px); display:none; z-index: 100;'> |
| 338 | 338 | <?php echo $uiElements->instLevelInfoBoxes($inst); ?> |
| 339 | 339 | <div class='infobox'> |
| 340 | - <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption;?></h2> |
|
| 340 | + <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption; ?></h2> |
|
| 341 | 341 | <table> |
| 342 | - <caption><?php echo $tablecaption;?></caption> |
|
| 342 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 343 | 343 | <tr> |
| 344 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
| 345 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
| 344 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
| 345 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
| 346 | 346 | </tr> |
| 347 | 347 | |
| 348 | 348 | <tr> |
@@ -366,19 +366,19 @@ discard block |
||
| 366 | 366 | case "NOSTIPULATION": |
| 367 | 367 | break; |
| 368 | 368 | case "EMAIL-SENT": |
| 369 | - echo $boundaryPre . $uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE) . $boundaryPost; |
|
| 369 | + echo $boundaryPre.$uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE).$boundaryPost; |
|
| 370 | 370 | break; |
| 371 | 371 | case "EMAIL-NOTSENT": |
| 372 | - echo $boundaryPre . $uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE) . $boundaryPost; |
|
| 372 | + echo $boundaryPre.$uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE).$boundaryPost; |
|
| 373 | 373 | break; |
| 374 | 374 | case "SMS-SENT": |
| 375 | - echo $boundaryPre . $uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE) . $boundaryPost; |
|
| 375 | + echo $boundaryPre.$uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE).$boundaryPost; |
|
| 376 | 376 | break; |
| 377 | 377 | case "SMS-NOTSENT": |
| 378 | - echo $boundaryPre . $uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE) . $boundaryPost; |
|
| 378 | + echo $boundaryPre.$uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE).$boundaryPost; |
|
| 379 | 379 | break; |
| 380 | 380 | case "SMS-FRAGMENT": |
| 381 | - echo $boundaryPre . $uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE) . $boundaryPost; |
|
| 381 | + echo $boundaryPre.$uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE).$boundaryPost; |
|
| 382 | 382 | break; |
| 383 | 383 | } |
| 384 | 384 | ?> |
@@ -391,17 +391,17 @@ discard block |
||
| 391 | 391 | <?php |
| 392 | 392 | $bufferCurrentUsers = "<table class='sb-user-table' style='max-width:1920px;'> |
| 393 | 393 | <tr class='sb-title-row_id'> |
| 394 | - <td>" . _("User") . "</td> |
|
| 395 | - <td>" . _("Token/Certificate details") . "</td> |
|
| 396 | - <td>" . _("User/Token Expiry") . "</td> |
|
| 397 | - <td>" . _("Actions") . "</td> |
|
| 394 | + <td>" . _("User")."</td> |
|
| 395 | + <td>" . _("Token/Certificate details")."</td> |
|
| 396 | + <td>" . _("User/Token Expiry")."</td> |
|
| 397 | + <td>" . _("Actions")."</td> |
|
| 398 | 398 | </tr>"; |
| 399 | 399 | $bufferPreviousUsers = "<table class='sb-user-table' style='max-width:1920px;'> |
| 400 | 400 | <tr class='sb-title-row_id'> |
| 401 | - <td>" . _("User") . "</td> |
|
| 402 | - <td>" . _("Certificate details") . "</td> |
|
| 403 | - <td>" . _("User Expiry") . "</td> |
|
| 404 | - <td>" . _("Actions") . "</td> |
|
| 401 | + <td>" . _("User")."</td> |
|
| 402 | + <td>" . _("Certificate details")."</td> |
|
| 403 | + <td>" . _("User Expiry")."</td> |
|
| 404 | + <td>" . _("Actions")."</td> |
|
| 405 | 405 | </tr>"; |
| 406 | 406 | |
| 407 | 407 | natsort($allUsers); |
@@ -458,23 +458,23 @@ discard block |
||
| 458 | 458 | $display = empty(devices\Devices::listDevices()[$oneCert->device]['display']) ? $oneCert->device : devices\Devices::listDevices()[$oneCert->device]['display']; |
| 459 | 459 | |
| 460 | 460 | $bufferText = "<div class='sb-certificate-summary ca-summary' $style> |
| 461 | - <div class='sb-certificate-details'>" . _("Device:") . " " . $display . |
|
| 462 | - "<br>" . _("Serial Number:") . " " . dechex($oneCert->serial) . |
|
| 463 | - "<br>" . _("CN:") . " " . explode('@', $oneCert->username)[0] . "@…" . |
|
| 464 | - "<br>" . _("Expiry:") . " " . $oneCert->expiry . |
|
| 465 | - "<br>" . _("Issued:") . " " . $oneCert->issued . |
|
| 466 | - "</div>" . |
|
| 461 | + <div class='sb-certificate-details'>"._("Device:")." ".$display. |
|
| 462 | + "<br>"._("Serial Number:")." ".dechex($oneCert->serial). |
|
| 463 | + "<br>"._("CN:")." ".explode('@', $oneCert->username)[0]."@…". |
|
| 464 | + "<br>"._("Expiry:")." ".$oneCert->expiry. |
|
| 465 | + "<br>"._("Issued:")." ".$oneCert->issued. |
|
| 466 | + "</div>". |
|
| 467 | 467 | "<div style='text-align:right;padding-top: 5px; $buttonStyle'>"; |
| 468 | 468 | |
| 469 | 469 | if ($buttonText == "") { |
| 470 | 470 | $bufferText .= $formtext |
| 471 | - . "<input type='hidden' name='certSerial' value='" . $oneCert->serial . "'/>" |
|
| 472 | - . "<input type='hidden' name='certAlgo' value='" . $oneCert->ca_type . "'/>" |
|
| 471 | + . "<input type='hidden' name='certSerial' value='".$oneCert->serial."'/>" |
|
| 472 | + . "<input type='hidden' name='certAlgo' value='".$oneCert->ca_type."'/>" |
|
| 473 | 473 | . "<button type='submit' " |
| 474 | 474 | . "name='command' " |
| 475 | - . "value='" . \web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL . "' " |
|
| 475 | + . "value='".\web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL."' " |
|
| 476 | 476 | . "class='delete' " |
| 477 | - . "onclick='return confirm(\"" . sprintf(_("The device in question will stop functioning with %s. The revocation cannot be undone. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name']) . "\")'>" |
|
| 477 | + . "onclick='return confirm(\"".sprintf(_("The device in question will stop functioning with %s. The revocation cannot be undone. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name'])."\")'>" |
|
| 478 | 478 | . _("Revoke") |
| 479 | 479 | . "</button>" |
| 480 | 480 | . "</form>"; |
@@ -499,13 +499,13 @@ discard block |
||
| 499 | 499 | } |
| 500 | 500 | // wrap the revoked and expired certs in a div that is hidden by default |
| 501 | 501 | if ($textRevokedCerts !== "") { |
| 502 | - $textRevokedCerts = "<span style='text-decoration: underline;' id='$oneUserId-revoked-heading' onclick='document.getElementById(\"$oneUserId-revoked-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-revoked-heading\").style.display = \"none\";'>" . sprintf(ngettext("(show %d revoked certificate)", "(show %d revoked certificates)", $countRevoked), $countRevoked) . "</span><div id='$oneUserId-revoked-certs' style='display:none;'>" . $textRevokedCerts . "</div>"; |
|
| 502 | + $textRevokedCerts = "<span style='text-decoration: underline;' id='$oneUserId-revoked-heading' onclick='document.getElementById(\"$oneUserId-revoked-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-revoked-heading\").style.display = \"none\";'>".sprintf(ngettext("(show %d revoked certificate)", "(show %d revoked certificates)", $countRevoked), $countRevoked)."</span><div id='$oneUserId-revoked-certs' style='display:none;'>".$textRevokedCerts."</div>"; |
|
| 503 | 503 | } |
| 504 | 504 | if ($textExpiredCerts !== "") { |
| 505 | - $textExpiredCerts = "<span style='text-decoration: underline;' id='$oneUserId-expired-heading' onclick='document.getElementById(\"$oneUserId-expired-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-expired-heading\").style.display = \"none\";'>" . sprintf(ngettext("(show %d expired certificate)", "(show %d expired certificates)", $countExpired), $countExpired) . "</span><div id='$oneUserId-expired-certs' style='display:none;'>" . $textExpiredCerts . "</div>"; |
|
| 505 | + $textExpiredCerts = "<span style='text-decoration: underline;' id='$oneUserId-expired-heading' onclick='document.getElementById(\"$oneUserId-expired-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-expired-heading\").style.display = \"none\";'>".sprintf(ngettext("(show %d expired certificate)", "(show %d expired certificates)", $countExpired), $countExpired)."</span><div id='$oneUserId-expired-certs' style='display:none;'>".$textExpiredCerts."</div>"; |
|
| 506 | 506 | } |
| 507 | 507 | // and push out the HTML |
| 508 | - ${$outputBuffer} .= $textActiveCerts . "<br/>" . $textExpiredCerts . " " . $textRevokedCerts . "</td>"; |
|
| 508 | + ${$outputBuffer} .= $textActiveCerts."<br/>".$textExpiredCerts." ".$textRevokedCerts."</td>"; |
|
| 509 | 509 | $tokenHtmlBuffer = ""; |
| 510 | 510 | $hasOnePendingInvite = FALSE; |
| 511 | 511 | foreach ($tokensWithoutCerts as $invitationObject) { |
@@ -516,38 +516,38 @@ discard block |
||
| 516 | 516 | $tokenHtmlBuffer .= "<tr class='sb-certificate-row_id'><td></td>"; |
| 517 | 517 | $jsEncodedBody = str_replace('\n', '%0D%0A', str_replace('"', '', json_encode($invitationObject->invitationMailBody()))); |
| 518 | 518 | $tokenHtmlBuffer .= "<td>"; |
| 519 | - $tokenHtmlBuffer .= sprintf(_("The invitation token %s is ready for sending! Choose how to send it:"), "<input type='text' readonly='readonly' style='background-color:lightgrey;' size='60' value='" . $invitationObject->link() . "' name='token' class='identifiedtokenarea-" . $invitationObject->identifier . "'>(…)<br/>"); |
|
| 519 | + $tokenHtmlBuffer .= sprintf(_("The invitation token %s is ready for sending! Choose how to send it:"), "<input type='text' readonly='readonly' style='background-color:lightgrey;' size='60' value='".$invitationObject->link()."' name='token' class='identifiedtokenarea-".$invitationObject->identifier."'>(…)<br/>"); |
|
| 520 | 520 | $tokenHtmlBuffer .= "<table> |
| 521 | - <tr><td style='vertical-align:bottom;'>" . _("E-Mail:") . "</td><td> |
|
| 521 | + <tr><td style='vertical-align:bottom;'>" . _("E-Mail:")."</td><td> |
|
| 522 | 522 | $formtext |
| 523 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 523 | + <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/> |
|
| 524 | 524 | <input type='text' name='address' id='address-$invitationObject->identifier'/> |
| 525 | - <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=" . $invitationObject->invitationMailSubject() . "&body=$jsEncodedBody\"; return false;'>" . _("Local mail client") . "</button> |
|
| 526 | - <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'>" . _("Send with CAT") . "</button> |
|
| 525 | + <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=".$invitationObject->invitationMailSubject()."&body=$jsEncodedBody\"; return false;'>"._("Local mail client")."</button> |
|
| 526 | + <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'>"._("Send with CAT")."</button> |
|
| 527 | 527 | </form> |
| 528 | 528 | </td></tr> |
| 529 | - <tr><td style='vertical-align:bottom;'>" . _("SMS:") . "</td><td> |
|
| 529 | + <tr><td style='vertical-align:bottom;'>" . _("SMS:")."</td><td> |
|
| 530 | 530 | $formtext |
| 531 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 531 | + <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/> |
|
| 532 | 532 | <input type='text' name='smsnumber' /> |
| 533 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS . "'>" . _("Send in SMS...") . "</button> |
|
| 533 | + <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS."'>"._("Send in SMS...")."</button> |
|
| 534 | 534 | </form> |
| 535 | 535 | </td></tr> |
| 536 | - <tr><td style='vertical-align:bottom;'>" . _("Manual:") . "</td><td> |
|
| 537 | - <button type='button' class='clipboardButton' onclick='clipboardCopy(" . $invitationObject->identifier . ");'>" . _("Copy to Clipboard") . "</button> |
|
| 536 | + <tr><td style='vertical-align:bottom;'>" . _("Manual:")."</td><td> |
|
| 537 | + <button type='button' class='clipboardButton' onclick='clipboardCopy(" . $invitationObject->identifier.");'>"._("Copy to Clipboard")."</button> |
|
| 538 | 538 | <form style='display:inline-block;' method='post' action='inc/displayQRcode.inc.php' onsubmit='popupQRWindow(this); return false;' accept-charset='UTF-8'> |
| 539 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 540 | - <button type='submit'>" . _("Display QR code") . "</button> |
|
| 539 | + <input type='hidden' value='" . $invitationObject->invitationTokenString."' name='token'><br/> |
|
| 540 | + <button type='submit'>" . _("Display QR code")."</button> |
|
| 541 | 541 | </form> |
| 542 | 542 | </td></tr> |
| 543 | 543 | |
| 544 | 544 | </table> |
| 545 | 545 | </td>"; |
| 546 | - $tokenHtmlBuffer .= "<td>" . _("Expiry Date:") . " " . $invitationObject->expiry . " UTC<br>" . _("Activations remaining:") . " " . sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal) . "</td>"; |
|
| 546 | + $tokenHtmlBuffer .= "<td>"._("Expiry Date:")." ".$invitationObject->expiry." UTC<br>"._("Activations remaining:")." ".sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal)."</td>"; |
|
| 547 | 547 | $tokenHtmlBuffer .= "<td>" |
| 548 | 548 | . $formtext |
| 549 | - . "<input type='hidden' name='invitationtoken' value='" . $invitationObject->invitationTokenString . "'/>" |
|
| 550 | - . "<button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_REVOKEINVITATION . "' class='delete'>" . _("Revoke") . "</button></form>" |
|
| 549 | + . "<input type='hidden' name='invitationtoken' value='".$invitationObject->invitationTokenString."'/>" |
|
| 550 | + . "<button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_REVOKEINVITATION."' class='delete'>"._("Revoke")."</button></form>" |
|
| 551 | 551 | . "</td></tr>"; |
| 552 | 552 | break; |
| 553 | 553 | case core\SilverbulletInvitation::SB_TOKENSTATUS_EXPIRED: |
@@ -563,10 +563,10 @@ discard block |
||
| 563 | 563 | } |
| 564 | 564 | ${$outputBuffer} .= "<td>$formtext |
| 565 | 565 | <div class='sb-date-container' style='min-width: 200px;'> |
| 566 | - <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='" . $profile->getUserExpiryDate($oneUserId) . "'> (UTC)</span> |
|
| 566 | + <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='".$profile->getUserExpiryDate($oneUserId)."'> (UTC)</span> |
|
| 567 | 567 | </div> |
| 568 | 568 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 569 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY . "'>" . _("Update") . "</button> |
|
| 569 | + <button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY."'>"._("Update")."</button> |
|
| 570 | 570 | </form> |
| 571 | 571 | </td> |
| 572 | 572 | <td> |
@@ -574,33 +574,33 @@ discard block |
||
| 574 | 574 | |
| 575 | 575 | if ($hasOnePendingInvite || count($validCerts) > 0) { |
| 576 | 576 | $deletionText = sprintf(_("All of the currently active devices will stop functioning with %s. This cannot be undone. While the user can be re-activated later, they will then need to be re-provisioned with new invitation tokens. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 577 | - ${$outputBuffer} .= $formtext . " |
|
| 577 | + ${$outputBuffer} .= $formtext." |
|
| 578 | 578 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 579 | 579 | <button type='submit' " |
| 580 | 580 | . "name='command' " |
| 581 | - . "value='" . \web\lib\common\FormElements::BUTTON_DEACTIVATEUSER . "' " |
|
| 581 | + . "value='".\web\lib\common\FormElements::BUTTON_DEACTIVATEUSER."' " |
|
| 582 | 582 | . "class='delete' " |
| 583 | - . ( count($validCerts) > 0 ? "onclick='return confirm(\"" . $deletionText . "\")' " : "" ) |
|
| 583 | + . (count($validCerts) > 0 ? "onclick='return confirm(\"".$deletionText."\")' " : "") |
|
| 584 | 584 | . ">" |
| 585 | 585 | . _("Deactivate User") |
| 586 | 586 | . "</button> |
| 587 | 587 | </form>"; |
| 588 | 588 | } |
| 589 | - ${$outputBuffer} .= "<form method='post' action='inc/userStats.inc.php?inst_id=" . $profile->institution . "&profile_id=" . $profile->identifier . "&user_id=$oneUserId' onsubmit='popupStatsWindow(this); return false;' accept-charset='UTF-8'> |
|
| 590 | - <button type='submit'>" . _("Show Authentication Records") . "</button> |
|
| 589 | + ${$outputBuffer} .= "<form method='post' action='inc/userStats.inc.php?inst_id=".$profile->institution."&profile_id=".$profile->identifier."&user_id=$oneUserId' onsubmit='popupStatsWindow(this); return false;' accept-charset='UTF-8'> |
|
| 590 | + <button type='submit'>"._("Show Authentication Records")."</button> |
|
| 591 | 591 | </form>"; |
| 592 | 592 | if (new DateTime() < new DateTime($expiryDate)) { // current user, allow sending new token |
| 593 | - ${$outputBuffer} .= $formtext . " |
|
| 593 | + ${$outputBuffer} .= $formtext." |
|
| 594 | 594 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 595 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_NEWINVITATION . "'>" . _("New Invitation") . "</button> |
|
| 596 | - <label>" . _("Activations:") . " |
|
| 595 | + <button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_NEWINVITATION."'>"._("New Invitation")."</button> |
|
| 596 | + <label>" . _("Activations:")." |
|
| 597 | 597 | <input type='text' name='invitationsquantity' value='5' maxlength='3' style='width: 30px;'/> |
| 598 | 598 | </label> |
| 599 | 599 | </form>"; |
| 600 | 600 | } elseif (count($profile->getUserAuthRecords($oneUserId, true)) == 0) { // previous user; if there are NO authentication records, allow full deletion - otherwise, need to keep user trace for abuse handling |
| 601 | - ${$outputBuffer} .= $formtext . " |
|
| 601 | + ${$outputBuffer} .= $formtext." |
|
| 602 | 602 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 603 | - <button type='submit' class='delete' name='command' value='" . \web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete User") . "</button> |
|
| 603 | + <button type='submit' class='delete' name='command' value='".\web\lib\common\FormElements::BUTTON_DELETE."'>"._("Delete User")."</button> |
|
| 604 | 604 | </form>"; |
| 605 | 605 | } |
| 606 | 606 | ${$outputBuffer} .= "</div> |
@@ -632,13 +632,13 @@ discard block |
||
| 632 | 632 | . ' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".' |
| 633 | 633 | . ' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.'), \config\ConfAssistant::SILVERBULLET['gracetime'] ?? core\ProfileSilverbullet::SB_ACKNOWLEDGEMENT_REQUIRED_DAYS); |
| 634 | 634 | |
| 635 | - echo $formtext . "<div style='padding-bottom: 20px;'>" |
|
| 635 | + echo $formtext."<div style='padding-bottom: 20px;'>" |
|
| 636 | 636 | . " |
| 637 | 637 | <p>$acknowledgeText</p> |
| 638 | 638 | <input type='checkbox' name='acknowledge' value='true'> |
| 639 | - <label>" . sprintf(_("I have verified that all configured users are still eligible for %s."),\config\ConfAssistant::CONSORTIUM['display_name']) . "</label> |
|
| 639 | + <label>".sprintf(_("I have verified that all configured users are still eligible for %s."), \config\ConfAssistant::CONSORTIUM['display_name'])."</label> |
|
| 640 | 640 | </div> |
| 641 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY . "'>" . _("Save") . "</button></form>"; |
|
| 641 | + <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY."'>"._("Save")."</button></form>"; |
|
| 642 | 642 | } |
| 643 | 643 | ?> |
| 644 | 644 | </div> |
