GEANT /
CAT
@@ -27,7 +27,7 @@ |
||
| 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 | |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
| 33 | 33 | $validator = new \web\lib\common\InputValidation(); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | ?> |
| 30 | 30 | |
| 31 | 31 | <?php |
| 32 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 32 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 33 | 33 | |
| 34 | 34 | $deco = new \web\lib\admin\PageDecoration(); |
| 35 | 35 | $validator = new \web\lib\common\InputValidation(); |
@@ -101,13 +101,13 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | -$newProfileName = $validator->string($_POST['new_profile'], true); |
|
| 104 | +$newProfileName = $validator->string($_POST['new_profile'], true); |
|
| 105 | 105 | $origProfileName = $validator->string($_POST['orig_profile_name'], true); |
| 106 | 106 | $handle = \core\DBConnection::handle("INST"); |
| 107 | 107 | |
| 108 | 108 | $result = runSelect($my_profile->identifier, $fields, 'profile', $handle); |
| 109 | 109 | $row = $result->fetch_assoc(); |
| 110 | -$row['showtime']= 0; |
|
| 110 | +$row['showtime'] = 0; |
|
| 111 | 111 | $row['preference'] = 1000; |
| 112 | 112 | copyRow($row, $fields, 'profile', $handle); |
| 113 | 113 | $newProfileId = $handle->lastID(); |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | \core\common\Entity::intoThePotatoes(); |
| 138 | 138 | $wizard = new \web\lib\admin\Wizard($wizardMode); |
| 139 | 139 | $retval = "<fieldset class='option_container_map'> |
| 140 | - <legend><strong>" . _("Location") . "</strong></legend>"; |
|
| 140 | + <legend><strong>" . _("Location")."</strong></legend>"; |
|
| 141 | 141 | $retval .= $wizard->displayHelp("location"); |
| 142 | 142 | if ($additional) { |
| 143 | 143 | $retval .= _("You can enter an <strong>additional</strong> location here. You can see the already defined locations in the 'General Information' field."); |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | */ |
| 155 | 155 | protected function htmlPostEdit($allowDirectInput) { |
| 156 | 156 | \core\common\Entity::intoThePotatoes(); |
| 157 | - $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>"; |
|
| 157 | + $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>"; |
|
| 158 | 158 | \core\common\Entity::outOfThePotatoes(); |
| 159 | 159 | return $retval; |
| 160 | 160 | } |
@@ -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 | |
@@ -417,15 +417,15 @@ discard block |
||
| 417 | 417 | div.ca-summary { |
| 418 | 418 | border: 1px dotted; |
| 419 | 419 | background-color: #ccccff; |
| 420 | - border-<?php echo $start;?>: 10px solid; |
|
| 421 | - border-<?php echo $start;?>-color: green; |
|
| 420 | + border-<?php echo $start; ?>: 10px solid; |
|
| 421 | + border-<?php echo $start; ?>-color: green; |
|
| 422 | 422 | padding: 2px; |
| 423 | - padding-<?php echo $start;?>: 8px; |
|
| 423 | + padding-<?php echo $start; ?>: 8px; |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | span.edu_cat { |
| 427 | 427 | font-weight: bold; |
| 428 | - color: <?php echo $colour2;?>; |
|
| 428 | + color: <?php echo $colour2; ?>; |
|
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | span.tooltip { |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | table.authrecord td { |
| 487 | - padding-<?php echo $end;?>: 10px; |
|
| 487 | + padding-<?php echo $end; ?>: 10px; |
|
| 488 | 488 | } |
| 489 | 489 | |
| 490 | 490 | p.MOTD { |
@@ -502,15 +502,15 @@ discard block |
||
| 502 | 502 | } |
| 503 | 503 | |
| 504 | 504 | .use_borders button { |
| 505 | - border-<?php echo $start;?>-style: outset; |
|
| 506 | - border-<?php echo $start;?>-width: 1px; |
|
| 507 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 505 | + border-<?php echo $start; ?>-style: outset; |
|
| 506 | + border-<?php echo $start; ?>-width: 1px; |
|
| 507 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 508 | 508 | border-top-style: outset; |
| 509 | 509 | border-top-width: 1px; |
| 510 | 510 | border-top-color: #8bbacb; |
| 511 | - border-<?php echo $end;?>-style: outset; |
|
| 512 | - border-<?php echo $end;?>-width: 2px; |
|
| 513 | - border-<?php echo $end;?>-color: #043d52; |
|
| 511 | + border-<?php echo $end; ?>-style: outset; |
|
| 512 | + border-<?php echo $end; ?>-width: 2px; |
|
| 513 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 514 | 514 | border-bottom-style: outset; |
| 515 | 515 | border-bottom-width: 2px; |
| 516 | 516 | border-bottom-color: #043d52; |
@@ -533,8 +533,8 @@ discard block |
||
| 533 | 533 | border-bottom-style:solid; |
| 534 | 534 | border-top-width:5px; |
| 535 | 535 | border-bottom-width:5px; |
| 536 | - border-color: <?php echo $colour1;?>; |
|
| 537 | - padding-<?php echo $start;?>:30px; |
|
| 536 | + border-color: <?php echo $colour1; ?>; |
|
| 537 | + padding-<?php echo $start; ?>:30px; |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | .no_borders button.disabledDevice { |
@@ -550,13 +550,13 @@ discard block |
||
| 550 | 550 | } |
| 551 | 551 | |
| 552 | 552 | input { |
| 553 | - margin-<?php echo $end;?>: 5px; |
|
| 553 | + margin-<?php echo $end; ?>: 5px; |
|
| 554 | 554 | |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | select { |
| 558 | 558 | vertical-align: middle; |
| 559 | - margin-<?php echo $start;?>: 10px; |
|
| 559 | + margin-<?php echo $start; ?>: 10px; |
|
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | td.notapplicable { |
@@ -589,8 +589,8 @@ discard block |
||
| 589 | 589 | |
| 590 | 590 | .signin_large { |
| 591 | 591 | vertical-align: top; |
| 592 | - padding-<?php echo $start;?>:20px; |
|
| 593 | - padding-<?php echo $end;?>:20px; |
|
| 592 | + padding-<?php echo $start; ?>:20px; |
|
| 593 | + padding-<?php echo $end; ?>:20px; |
|
| 594 | 594 | color: #bfd5dc; |
| 595 | 595 | font-size: 20px; |
| 596 | 596 | } |
@@ -603,34 +603,34 @@ discard block |
||
| 603 | 603 | } |
| 604 | 604 | |
| 605 | 605 | #close_button { |
| 606 | - background: <?php echo $colour2;?>; |
|
| 606 | + background: <?php echo $colour2; ?>; |
|
| 607 | 607 | color: #FFFFFF; |
| 608 | 608 | height: 23px; |
| 609 | - border-<?php echo $start;?>-style: inset; |
|
| 610 | - border-<?php echo $start;?>-width: 1px; |
|
| 611 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 609 | + border-<?php echo $start; ?>-style: inset; |
|
| 610 | + border-<?php echo $start; ?>-width: 1px; |
|
| 611 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 612 | 612 | border-top-style: inset; |
| 613 | 613 | border-top-width: 1px; |
| 614 | 614 | border-top-color: #8bbacb; |
| 615 | - border-<?php echo $end;?>-style: outset; |
|
| 616 | - border-<?php echo $end;?>-width: 2px; |
|
| 617 | - border-<?php echo $end;?>-color: #043d52; |
|
| 615 | + border-<?php echo $end; ?>-style: outset; |
|
| 616 | + border-<?php echo $end; ?>-width: 2px; |
|
| 617 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 618 | 618 | border-bottom-style: outset; |
| 619 | 619 | border-bottom-width: 2px; |
| 620 | 620 | border-bottom-color: #043d52; |
| 621 | - padding-<?php echo $start;?>: 5px; |
|
| 622 | - padding-<?php echo $end;?>: 5px; |
|
| 621 | + padding-<?php echo $start; ?>: 5px; |
|
| 622 | + padding-<?php echo $end; ?>: 5px; |
|
| 623 | 623 | padding-top: 1px; |
| 624 | 624 | padding-bottom: 1px; |
| 625 | 625 | position: relative; |
| 626 | - <?php echo $start;?>: 640px; |
|
| 626 | + <?php echo $start; ?>: 640px; |
|
| 627 | 627 | cursor:pointer; |
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | #loading_ico { |
| 631 | 631 | display: none; |
| 632 | 632 | position: absolute; |
| 633 | - <?php echo $start;?>: 200px; |
|
| 633 | + <?php echo $start; ?>: 200px; |
|
| 634 | 634 | top: 220px; |
| 635 | 635 | z-index: 200; |
| 636 | 636 | text-align: center; |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | z-index: 100; |
| 645 | 645 | position: absolute; |
| 646 | 646 | width: 700px; |
| 647 | - <?php echo $start;?>: 200px; |
|
| 647 | + <?php echo $start; ?>: 200px; |
|
| 648 | 648 | text-align: justify; |
| 649 | 649 | top: 200px; |
| 650 | 650 | box-shadow: 5px 5px 5px #666666; |
@@ -652,23 +652,23 @@ discard block |
||
| 652 | 652 | } |
| 653 | 653 | |
| 654 | 654 | #user_info { |
| 655 | - padding-<?php echo $start;?>: 30px; |
|
| 655 | + padding-<?php echo $start; ?>: 30px; |
|
| 656 | 656 | font-size: 11px; |
| 657 | 657 | font-weight: normal; |
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | #user_welcome { |
| 661 | 661 | background: #ffffff; |
| 662 | - padding-<?php echo $start;?>: 30px; |
|
| 662 | + padding-<?php echo $start; ?>: 30px; |
|
| 663 | 663 | padding-top: 20px; |
| 664 | - padding-<?php echo $end;?>: 180px; |
|
| 664 | + padding-<?php echo $end; ?>: 180px; |
|
| 665 | 665 | font-size: 12px; |
| 666 | 666 | font-weight: normal; |
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | #devices { |
| 670 | 670 | z-index:90; |
| 671 | - padding-<?php echo $start;?>: 30px; |
|
| 671 | + padding-<?php echo $start; ?>: 30px; |
|
| 672 | 672 | font-size: 11px; |
| 673 | 673 | font-weight: normal; |
| 674 | 674 | position: relative; |
@@ -676,15 +676,15 @@ discard block |
||
| 676 | 676 | |
| 677 | 677 | #profile_list { |
| 678 | 678 | width: 30em; |
| 679 | - padding-<?php echo $start;?>: 10px; |
|
| 680 | - padding-<?php echo $end;?>: 0px; |
|
| 681 | - background: <?php echo $colour2;?>; |
|
| 679 | + padding-<?php echo $start; ?>: 10px; |
|
| 680 | + padding-<?php echo $end; ?>: 0px; |
|
| 681 | + background: <?php echo $colour2; ?>; |
|
| 682 | 682 | color: white; |
| 683 | 683 | box-shadow: 10px 10px 5px #888888; |
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | #profile_redirect { |
| 687 | - padding-<?php echo $start;?>: 30px; |
|
| 687 | + padding-<?php echo $start; ?>: 30px; |
|
| 688 | 688 | padding-top: 20px; |
| 689 | 689 | font-size: 11px; |
| 690 | 690 | font-weight: normal; |
@@ -694,13 +694,13 @@ discard block |
||
| 694 | 694 | } |
| 695 | 695 | |
| 696 | 696 | #profiles { |
| 697 | - padding-<?php echo $start;?>: 30px; |
|
| 697 | + padding-<?php echo $start; ?>: 30px; |
|
| 698 | 698 | font-size: 11px; |
| 699 | 699 | padding-bottom: 10px |
| 700 | 700 | } |
| 701 | 701 | |
| 702 | 702 | #signin { |
| 703 | - padding-<?php echo $start;?>: 30px; |
|
| 703 | + padding-<?php echo $start; ?>: 30px; |
|
| 704 | 704 | padding-top: 10px; |
| 705 | 705 | } |
| 706 | 706 | |
@@ -724,8 +724,8 @@ discard block |
||
| 724 | 724 | font-size: 14px; |
| 725 | 725 | padding-top: 4px; |
| 726 | 726 | padding-bottom: 12px; |
| 727 | - padding-<?php echo $start;?>: 30px; |
|
| 728 | - background: <?php echo $colour1;?>; |
|
| 727 | + padding-<?php echo $start; ?>: 30px; |
|
| 728 | + background: <?php echo $colour1; ?>; |
|
| 729 | 729 | text-align: start; |
| 730 | 730 | text-shadow: 10px 10px 5px #888888; |
| 731 | 731 | } |
@@ -735,9 +735,9 @@ discard block |
||
| 735 | 735 | border-bottom-style:solid; |
| 736 | 736 | border-top-width:5px; |
| 737 | 737 | border-bottom-width:5px; |
| 738 | - border-color: <?php echo $colour1;?>; |
|
| 739 | - padding-<?php echo $start;?>:30px; |
|
| 740 | - color: <?php echo $colour2;?>; |
|
| 738 | + border-color: <?php echo $colour1; ?>; |
|
| 739 | + padding-<?php echo $start; ?>:30px; |
|
| 740 | + color: <?php echo $colour2; ?>; |
|
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | #heading h1 { |
@@ -752,11 +752,11 @@ discard block |
||
| 752 | 752 | |
| 753 | 753 | #welcome { |
| 754 | 754 | padding: 20px; |
| 755 | - padding-<?php echo $start;?>: 30px; |
|
| 755 | + padding-<?php echo $start; ?>: 30px; |
|
| 756 | 756 | text-align: justify; |
| 757 | 757 | border-bottom-style:solid; |
| 758 | 758 | border-bottom-width:5px; |
| 759 | - border-color: <?php echo $colour1;?>; |
|
| 759 | + border-color: <?php echo $colour1; ?>; |
|
| 760 | 760 | font-size: 11px; |
| 761 | 761 | font-weight: normal; |
| 762 | 762 | } |
@@ -765,14 +765,14 @@ discard block |
||
| 765 | 765 | #main_menu_info { |
| 766 | 766 | position: relative; |
| 767 | 767 | top: 15px; |
| 768 | - <?php echo $start;?>: 0px; |
|
| 769 | - padding:10px; padding-<?php echo $start;?>:20px; padding-<?php echo $end;?>:20px; |
|
| 768 | + <?php echo $start; ?>: 0px; |
|
| 769 | + padding:10px; padding-<?php echo $start; ?>:20px; padding-<?php echo $end; ?>:20px; |
|
| 770 | 770 | background: #f0f0f0; |
| 771 | 771 | border: 1px solid #dddddd; |
| 772 | - margin-<?php echo $start;?>: 25px; |
|
| 773 | - padding-<?php echo $start;?>: 25px; |
|
| 774 | - margin-<?php echo $end;?>: 25px; |
|
| 775 | - padding-<?php echo $end;?>: 25px; |
|
| 772 | + margin-<?php echo $start; ?>: 25px; |
|
| 773 | + padding-<?php echo $start; ?>: 25px; |
|
| 774 | + margin-<?php echo $end; ?>: 25px; |
|
| 775 | + padding-<?php echo $end; ?>: 25px; |
|
| 776 | 776 | padding-bottom: 10px; |
| 777 | 777 | vertical-align: top; |
| 778 | 778 | box-shadow: 5px 5px 5px #666666; |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | |
| 804 | 804 | #faq { |
| 805 | 805 | padding: 20px; |
| 806 | - color: <?php echo $colour2;?>; |
|
| 806 | + color: <?php echo $colour2; ?>; |
|
| 807 | 807 | background: #ffffff; |
| 808 | 808 | } |
| 809 | 809 | |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | #idp_logo { |
| 822 | 822 | display:none; |
| 823 | 823 | position:absolute; |
| 824 | - <?php echo $end;?>:30px; |
|
| 824 | + <?php echo $end; ?>:30px; |
|
| 825 | 825 | max-height:150px; |
| 826 | 826 | max-width:150px; |
| 827 | 827 | padding-top:10px; |
@@ -844,18 +844,18 @@ discard block |
||
| 844 | 844 | #slides img { |
| 845 | 845 | position: absolute; |
| 846 | 846 | top: 145px; |
| 847 | - <?php echo $end;?>: 60px; |
|
| 847 | + <?php echo $end; ?>: 60px; |
|
| 848 | 848 | } |
| 849 | 849 | |
| 850 | 850 | #slides span { |
| 851 | 851 | position: absolute; |
| 852 | - <?php echo $start;?>: 180px; |
|
| 852 | + <?php echo $start; ?>: 180px; |
|
| 853 | 853 | z-index: 20; |
| 854 | 854 | } |
| 855 | 855 | |
| 856 | 856 | #line1 { |
| 857 | 857 | top:145px; |
| 858 | - color: <?php echo $colour2;?>; |
|
| 858 | + color: <?php echo $colour2; ?>; |
|
| 859 | 859 | font-size:20px; |
| 860 | 860 | } |
| 861 | 861 | |
@@ -867,7 +867,7 @@ discard block |
||
| 867 | 867 | |
| 868 | 868 | #line3 { |
| 869 | 869 | top:245px; |
| 870 | - <?php echo $start;?>: 200px; |
|
| 870 | + <?php echo $start; ?>: 200px; |
|
| 871 | 871 | color: maroon; |
| 872 | 872 | font-size:25px; |
| 873 | 873 | } |
@@ -896,16 +896,16 @@ discard block |
||
| 896 | 896 | height:100%; |
| 897 | 897 | border-spacing:0; |
| 898 | 898 | border-collapse:collapse; |
| 899 | - padding-<?php echo $start;?>:200px; |
|
| 899 | + padding-<?php echo $start; ?>:200px; |
|
| 900 | 900 | padding-top:10px; |
| 901 | 901 | } |
| 902 | 902 | |
| 903 | 903 | #front_page_leftmenu { |
| 904 | - border-<?php echo $end;?>:solid; |
|
| 905 | - border-color: <?php echo $colour1;?>; |
|
| 904 | + border-<?php echo $end; ?>:solid; |
|
| 905 | + border-color: <?php echo $colour1; ?>; |
|
| 906 | 906 | border-width:5px; |
| 907 | 907 | min-height:400px; |
| 908 | - padding-<?php echo $start;?>: 10px; |
|
| 908 | + padding-<?php echo $start; ?>: 10px; |
|
| 909 | 909 | vertical-align:top; |
| 910 | 910 | width:110px; |
| 911 | 911 | padding-top:30px; |
@@ -915,8 +915,8 @@ discard block |
||
| 915 | 915 | vertical-align: top; |
| 916 | 916 | height:280px; |
| 917 | 917 | background: #fff; |
| 918 | - padding-<?php echo $start;?>: 20px; |
|
| 919 | - padding-<?php echo $end;?>: 20px; |
|
| 918 | + padding-<?php echo $start; ?>: 20px; |
|
| 919 | + padding-<?php echo $end; ?>: 20px; |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | #user_button_td { |
@@ -927,11 +927,11 @@ discard block |
||
| 927 | 927 | } |
| 928 | 928 | |
| 929 | 929 | a:link { |
| 930 | - color:<?php echo $colour2;?>; |
|
| 930 | + color:<?php echo $colour2; ?>; |
|
| 931 | 931 | } |
| 932 | 932 | |
| 933 | 933 | a:visited { |
| 934 | - color:<?php echo $colour2;?>; |
|
| 934 | + color:<?php echo $colour2; ?>; |
|
| 935 | 935 | } |
| 936 | 936 | |
| 937 | 937 | a:hover { |
@@ -939,7 +939,7 @@ discard block |
||
| 939 | 939 | } |
| 940 | 940 | |
| 941 | 941 | a:active { |
| 942 | - color:<?php echo $colour2;?>; |
|
| 942 | + color:<?php echo $colour2; ?>; |
|
| 943 | 943 | } |
| 944 | 944 | |
| 945 | 945 | .comment { |
@@ -970,14 +970,14 @@ discard block |
||
| 970 | 970 | table.user_overview th { |
| 971 | 971 | text-align: start; |
| 972 | 972 | background: #f0f0f0; |
| 973 | - padding-<?php echo $start;?>: 4px; |
|
| 974 | - padding-<?php echo $end;?>: 4px; |
|
| 973 | + padding-<?php echo $start; ?>: 4px; |
|
| 974 | + padding-<?php echo $end; ?>: 4px; |
|
| 975 | 975 | } |
| 976 | 976 | |
| 977 | 977 | table.user_overview td { |
| 978 | 978 | border-top-style: none; |
| 979 | - padding-<?php echo $start;?>: 4px; |
|
| 980 | - padding-<?php echo $end;?>: 4px; |
|
| 979 | + padding-<?php echo $start; ?>: 4px; |
|
| 980 | + padding-<?php echo $end; ?>: 4px; |
|
| 981 | 981 | vertical-align: middle; |
| 982 | 982 | height: 28px; |
| 983 | 983 | } |
@@ -994,14 +994,14 @@ discard block |
||
| 994 | 994 | .download_button_text { |
| 995 | 995 | width: 380px; |
| 996 | 996 | position:absolute; |
| 997 | - <?php echo $end;?>: 5px; |
|
| 997 | + <?php echo $end; ?>: 5px; |
|
| 998 | 998 | padding-top:0px; |
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | #download_info { |
| 1002 | 1002 | background: #f0f0f0; |
| 1003 | - padding-<?php echo $start;?>: 20px; |
|
| 1004 | - padding-<?php echo $end;?>: 20px; |
|
| 1003 | + padding-<?php echo $start; ?>: 20px; |
|
| 1004 | + padding-<?php echo $end; ?>: 20px; |
|
| 1005 | 1005 | padding-top:3px; |
| 1006 | 1006 | padding-bottom:3px; |
| 1007 | 1007 | } |
@@ -1045,7 +1045,7 @@ discard block |
||
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | 1047 | .downloads tr td { |
| 1048 | - text-align: <?php echo $end;?>; |
|
| 1048 | + text-align: <?php echo $end; ?>; |
|
| 1049 | 1049 | padding-left: 5px; |
| 1050 | 1050 | padding-right: 5px; |
| 1051 | 1051 | border-bottom-style: solid; |
@@ -1053,5 +1053,5 @@ discard block |
||
| 1053 | 1053 | } |
| 1054 | 1054 | |
| 1055 | 1055 | .downloads tr td:first-child { |
| 1056 | - text-align: <?php echo $start;?>; |
|
| 1056 | + text-align: <?php echo $start; ?>; |
|
| 1057 | 1057 | } |
| 1058 | 1058 | \ No newline at end of file |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * License: see the web/copyright.inc.php file in the file structure or |
| 20 | 20 | * <base_url>/copyright.php after deploying the software |
| 21 | 21 | */ |
| 22 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 22 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 23 | 23 | $languageInstance = new \core\common\Language(); |
| 24 | 24 | $languageInstance->setTextDomain("diagnostics"); |
| 25 | 25 | $loggerInstance = new \core\common\Logging(); |
@@ -63,47 +63,47 @@ discard block |
||
| 63 | 63 | $select = "<div id='sp_abuse_problem'> |
| 64 | 64 | <select style='margin-left: 0px;' id='select_sp_problem'>"; |
| 65 | 65 | foreach ($sp_problem as $pname => $pdesc) { |
| 66 | - $select = $select . "<option value='$pname'>$pdesc</option>\n"; |
|
| 66 | + $select = $select."<option value='$pname'>$pdesc</option>\n"; |
|
| 67 | 67 | } |
| 68 | - $select = $select . "</select></div>"; |
|
| 68 | + $select = $select."</select></div>"; |
|
| 69 | 69 | $res = " |
| 70 | 70 | <input type='hidden' name='token' id='token' value=''> |
| 71 | 71 | <input type='hidden' name='tests_result' id='tests_result' value=''> |
| 72 | 72 | <table id='sp_questions'> |
| 73 | 73 | <tr id='sp_problem_selector'> |
| 74 | - <td>" . _("Select your problem") . "</td> |
|
| 74 | + <td>" . _("Select your problem")."</td> |
|
| 75 | 75 | <td>$select</td> |
| 76 | 76 | </tr> |
| 77 | 77 | <tr> |
| 78 | - <td>" . _("What is the realm of the IdP in question?") . "</td> |
|
| 78 | + <td>"._("What is the realm of the IdP in question?")."</td> |
|
| 79 | 79 | <td> |
| 80 | 80 | <input type='text' name='admin_realm' id='admin_realm' value='$realmFromURL'> |
| 81 | - <button class='diag_button' id='realm_in_db_admin' style='display: none;' accesskey='R' type='button'>" . |
|
| 82 | - _("Check this realm") . |
|
| 81 | + <button class='diag_button' id='realm_in_db_admin' style='display: none;' accesskey='R' type='button'>". |
|
| 82 | + _("Check this realm"). |
|
| 83 | 83 | "</button> |
| 84 | 84 | <div id='tests_info_area'></div> |
| 85 | 85 | </td> |
| 86 | 86 | </tr> |
| 87 | 87 | <tr id='outer_user_row' class='hidden_row'> |
| 88 | - <td>" . _("Do you prefer to use a specific outer identity for diagnostics test?") . "</td> |
|
| 88 | + <td>" . _("Do you prefer to use a specific outer identity for diagnostics test?")."</td> |
|
| 89 | 89 | <td> <input type='text' name='outer_user' id='outer_user' value=''><span id='outer_user_realm'></span> |
| 90 | 90 | </tr> |
| 91 | 91 | <tr class='hidden_row'> |
| 92 | - <td>" . _("What is the authentication timestamp of the user session in question?") . "</td> |
|
| 92 | + <td>" . _("What is the authentication timestamp of the user session in question?")."</td> |
|
| 93 | 93 | <td><input type='text' id='timestamp' name='timestamp'> |
| 94 | 94 | <div id='datepicker'></div> |
| 95 | 95 | </td> |
| 96 | 96 | </tr> |
| 97 | 97 | <tr class='hidden_row'> |
| 98 | - <td>" . _("What is the MAC address of the user session in question?") . "</td> |
|
| 98 | + <td>" . _("What is the MAC address of the user session in question?")."</td> |
|
| 99 | 99 | <td><input type='text' id='mac' name='mac'></td> |
| 100 | 100 | </tr> |
| 101 | 101 | <tr class='hidden_row'> |
| 102 | - <td>" . _("Additional comments") . "</td> |
|
| 102 | + <td>" . _("Additional comments")."</td> |
|
| 103 | 103 | <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td> |
| 104 | 104 | </tr> |
| 105 | 105 | <tr class='hidden_row'> |
| 106 | - <td>" . _("Please specify an email address on which the IdP can contact you") . "</td> |
|
| 106 | + <td>" . _("Please specify an email address on which the IdP can contact you")."</td> |
|
| 107 | 107 | <td><input type='text' id='email' name='email'></td> |
| 108 | 108 | </tr> |
| 109 | 109 | <tr> |
@@ -111,82 +111,82 @@ discard block |
||
| 111 | 111 | <td></td> |
| 112 | 112 | </tr> |
| 113 | 113 | <tr class='hidden_row' id='send_query_to_idp'> |
| 114 | - <td>" . _("Now you can send your query") . "</td> |
|
| 115 | - <td><button type='submit' class='diag_button' id='submit_idp_query' name='go'>" . _("Send") . "</button></td> |
|
| 114 | + <td>" . _("Now you can send your query")."</td> |
|
| 115 | + <td><button type='submit' class='diag_button' id='submit_idp_query' name='go'>" . _("Send")."</button></td> |
|
| 116 | 116 | </tr> |
| 117 | 117 | </table>"; |
| 118 | - $res = $res . $javascript; |
|
| 118 | + $res = $res.$javascript; |
|
| 119 | 119 | } |
| 120 | 120 | if ($queryType == 'idp') { |
| 121 | 121 | $select = "<div id='idp_reported_problem' style='display:;'> |
| 122 | 122 | <select style='margin-left:0px;' id='select_idp_problem'>"; |
| 123 | 123 | foreach ($idp_problem as $pname => $pdesc) { |
| 124 | - $select = $select . "<option value='$pname'>$pdesc</option>\n"; |
|
| 124 | + $select = $select."<option value='$pname'>$pdesc</option>\n"; |
|
| 125 | 125 | } |
| 126 | - $select = $select . "</select></div>"; |
|
| 126 | + $select = $select."</select></div>"; |
|
| 127 | 127 | $res = " |
| 128 | 128 | <table id='idp_questions'> |
| 129 | 129 | <tr> |
| 130 | - <td>" . _("Select your problem") . "</td> |
|
| 130 | + <td>" . _("Select your problem")."</td> |
|
| 131 | 131 | <td>$select</td> |
| 132 | 132 | </tr> |
| 133 | 133 | <tr> |
| 134 | - <td>" . _("Identify the SP by one of following means") . "</td> |
|
| 134 | + <td>"._("Identify the SP by one of following means")."</td> |
|
| 135 | 135 | <td></td> |
| 136 | 136 | </tr> |
| 137 | 137 | <tr id='by_opname'> |
| 138 | - <td>" . _("SP Operator-Name attribute") . "</td> |
|
| 138 | + <td>" . _("SP Operator-Name attribute")."</td> |
|
| 139 | 139 | <td><input type='text' id='opname' name='opname' value=''></td> |
| 140 | 140 | </tr> |
| 141 | 141 | <tr id='spmanually'> |
| 142 | - <td>" . _("Select the SP manually:") . "</td> |
|
| 142 | + <td>" . _("Select the SP manually:")."</td> |
|
| 143 | 143 | <td> |
| 144 | 144 | <div id='select_asp_country'><a href='' id='asp_countries_list'> |
| 145 | - <span id='opnameselect'>" . _("click to select country and organisation") . "</a></span> |
|
| 145 | + <span id='opnameselect'>" . _("click to select country and organisation")."</a></span> |
|
| 146 | 146 | </div> |
| 147 | 147 | <div id='select_asp_area'></div> |
| 148 | 148 | </td> |
| 149 | 149 | </tr> |
| 150 | 150 | <tr id='asp_desc' style='display: none;'> |
| 151 | - <td>" . _("or") . ' ' . _("at least describe the SP location") . "</td> |
|
| 151 | + <td>" . _("or").' '._("at least describe the SP location")."</td> |
|
| 152 | 152 | <td><input type='text' id='asp_location' name='asp_location' value=''></td> |
| 153 | 153 | </tr> |
| 154 | 154 | <tr> |
| 155 | - <td>" . _("What is the outer ID of the user session in question?") . "</td> |
|
| 155 | + <td>" . _("What is the outer ID of the user session in question?")."</td> |
|
| 156 | 156 | <td><input type='text' id='outer_id' name='outer_id' value=''></td> |
| 157 | 157 | </tr> |
| 158 | 158 | <tr> |
| 159 | - <td>" . _("What is the authentication timestamp of the user session in question?") . "</td> |
|
| 159 | + <td>" . _("What is the authentication timestamp of the user session in question?")."</td> |
|
| 160 | 160 | <td> |
| 161 | 161 | <input type='text' id='timestamp' name='timestamp'> |
| 162 | 162 | <div id='datepicker'></div> |
| 163 | 163 | </td> |
| 164 | 164 | </tr> |
| 165 | 165 | <tr> |
| 166 | - <td>" . _("What is the MAC address of the user session in question?") . "</td> |
|
| 166 | + <td>" . _("What is the MAC address of the user session in question?")."</td> |
|
| 167 | 167 | <td><input type='text' id='mac' name='mac'></td> |
| 168 | 168 | </tr> |
| 169 | 169 | <tr> |
| 170 | - <td>" . _("Additional comments about the problem") . "</td> |
|
| 170 | + <td>" . _("Additional comments about the problem")."</td> |
|
| 171 | 171 | <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td> |
| 172 | 172 | </tr> |
| 173 | 173 | <tr> |
| 174 | - <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?") . "</td> |
|
| 174 | + <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?")."</td> |
|
| 175 | 175 | <td><textarea id='c_details' name='c_details' cols='60' rows='5'></textarea></td> |
| 176 | 176 | </tr> |
| 177 | 177 | <tr> |
| 178 | - <td>" . _("Please specify an email address on which the SP can contact you") . "</td> |
|
| 178 | + <td>" . _("Please specify an email address on which the SP can contact you")."</td> |
|
| 179 | 179 | <td><input type='text' id='email' name='email'></td> |
| 180 | 180 | </tr> |
| 181 | 181 | <tr class='hidden_row' id='send_query_to_sp'> |
| 182 | - <td>" . _("Now you can send your query") . "</td> |
|
| 183 | - <td><button type='submit' class='diag_button' id='submit_sp_query' name='go'>" . _("Send") . "</button></td> |
|
| 182 | + <td>" . _("Now you can send your query")."</td> |
|
| 183 | + <td><button type='submit' class='diag_button' id='submit_sp_query' name='go'>" . _("Send")."</button></td> |
|
| 184 | 184 | </tr> |
| 185 | 185 | </table>"; |
| 186 | - $res = $res . $javascript; |
|
| 186 | + $res = $res.$javascript; |
|
| 187 | 187 | } |
| 188 | 188 | if ($queryType == 'idp_send' || $queryType == 'sp_send') { |
| 189 | - include_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 189 | + include_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 190 | 190 | $cat = new \core\CAT(); |
| 191 | 191 | $returnArray = array(); |
| 192 | 192 | if (count((array) $o) > 0) { |
@@ -195,8 +195,8 @@ discard block |
||
| 195 | 195 | switch ($key) { |
| 196 | 196 | case 'realm': |
| 197 | 197 | $pos = strpos($value, '@'); |
| 198 | - if ($pos !== FALSE ) { |
|
| 199 | - $value = substr($value, $pos+1); |
|
| 198 | + if ($pos !== FALSE) { |
|
| 199 | + $value = substr($value, $pos + 1); |
|
| 200 | 200 | } |
| 201 | 201 | case 'email': |
| 202 | 202 | $returnArray[$key] = filter_var($value, FILTER_VALIDATE_EMAIL); |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | $mail = \core\common\OutsideComm::mailHandle(); |
| 238 | 238 | $emails = ['[email protected]']; |
| 239 | 239 | //$emails = explode(',', $returnArray['idpcontact']); |
| 240 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System"; |
|
| 240 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System"; |
|
| 241 | 241 | foreach ($emails as $email) { |
| 242 | 242 | $mail->addAddress($email); |
| 243 | 243 | } |
@@ -247,11 +247,11 @@ discard block |
||
| 247 | 247 | } else { |
| 248 | 248 | $link = 'http://'; |
| 249 | 249 | } |
| 250 | - $link .= $_SERVER['SERVER_NAME'] . \core\CAT::getRootUrlPath() . '/diag/show_realmcheck.php?token=' . $returnArray['token']; |
|
| 250 | + $link .= $_SERVER['SERVER_NAME'].\core\CAT::getRootUrlPath().'/diag/show_realmcheck.php?token='.$returnArray['token']; |
|
| 251 | 251 | $returnArray['testurl'] = $link; |
| 252 | 252 | $mail->Subject = _('Suspected a technical problem with the IdP'); |
| 253 | - $txt = _("We suspect a technical problem with the IdP handling the realm") . ' ' . |
|
| 254 | - $returnArray['realm'] . ".\n"; |
|
| 253 | + $txt = _("We suspect a technical problem with the IdP handling the realm").' '. |
|
| 254 | + $returnArray['realm'].".\n"; |
|
| 255 | 255 | $txt .= _("The CAT diagnostic test was run for this realm during reporting.\n"); |
| 256 | 256 | $txt .= _("The overall result was "); |
| 257 | 257 | if ($returnArray['tests_result'] == 0) { |
@@ -259,15 +259,15 @@ discard block |
||
| 259 | 259 | } else { |
| 260 | 260 | $txt .= _("failure"); |
| 261 | 261 | } |
| 262 | - $txt .= ".\n" . _("To see details go to "); |
|
| 262 | + $txt .= ".\n"._("To see details go to "); |
|
| 263 | 263 | $txt .= "$link\n\n"; |
| 264 | - $txt .= _("The reported problem details are as follows") . "\n"; |
|
| 265 | - $txt .= _("timestamp") . ": " . $returnArray['timestamp'] . "\n"; |
|
| 266 | - $txt .= _("client MAC address") . ": " . $returnArray['mac'] . "\n"; |
|
| 264 | + $txt .= _("The reported problem details are as follows")."\n"; |
|
| 265 | + $txt .= _("timestamp").": ".$returnArray['timestamp']."\n"; |
|
| 266 | + $txt .= _("client MAC address").": ".$returnArray['mac']."\n"; |
|
| 267 | 267 | if ($returnArray['freetext']) { |
| 268 | - $txt .= _("additional comments") . ': ' . $returnArray['freetext'] . "\n"; |
|
| 268 | + $txt .= _("additional comments").': '.$returnArray['freetext']."\n"; |
|
| 269 | 269 | } |
| 270 | - $txt .= "\n" . _("You can contact the incident reporter at") . ' ' . $returnArray['email']; |
|
| 270 | + $txt .= "\n"._("You can contact the incident reporter at").' '.$returnArray['email']; |
|
| 271 | 271 | |
| 272 | 272 | $mail->Body = $txt; |
| 273 | 273 | $sent = $mail->send(); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $telepath = new \core\diag\Telepath($givenRealm); |
| 109 | 109 | $outerUser = $telepath->getOuter(); |
| 110 | 110 | } |
| 111 | - $testsuite = new \core\diag\RADIUSTests($givenRealm, $outerUser . '@' . $givenRealm); |
|
| 111 | + $testsuite = new \core\diag\RADIUSTests($givenRealm, $outerUser.'@'.$givenRealm); |
|
| 112 | 112 | |
| 113 | 113 | $naptr = $rfc7585suite->relevantNAPTR(); |
| 114 | 114 | if ($naptr != \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED && $naptr > 0) { |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | $json_data = json_encode($returnArray); |
| 207 | 207 | |
| 208 | 208 | if ($token) { |
| 209 | - $loggerInstance->debug(4, 'JSON data written to ' .$jsonDir.'/'.$token); |
|
| 209 | + $loggerInstance->debug(4, 'JSON data written to '.$jsonDir.'/'.$token); |
|
| 210 | 210 | file_put_contents($jsonDir.'/'.$token.'/realm', $json_data); |
| 211 | 211 | } |
| 212 | 212 | header("Content-type: application/json; utf-8"); |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | $deployment->deactivate(); |
| 110 | 110 | } |
| 111 | 111 | header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . |
| 112 | - $deployment->identifier); |
|
| 112 | + $deployment->identifier); |
|
| 113 | 113 | exit(0); |
| 114 | 114 | case web\lib\common\FormElements::BUTTON_REMOVESP: |
| 115 | 115 | $deployment->remove(); |
@@ -158,12 +158,12 @@ |
||
| 158 | 158 | } |
| 159 | 159 | if (isset($_POST['command'])) { |
| 160 | 160 | switch ($_POST['command']) { |
| 161 | - case web\lib\common\FormElements::BUTTON_CLOSE: |
|
| 162 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier) . '#profilebox_' . $deployment->identifier; |
|
| 163 | - exit(0); |
|
| 164 | - default: |
|
| 165 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier); |
|
| 166 | - exit(0); |
|
| 161 | + case web\lib\common\FormElements::BUTTON_CLOSE: |
|
| 162 | + header("Location: overview_org.php?inst_id=" . $my_inst->identifier) . '#profilebox_' . $deployment->identifier; |
|
| 163 | + exit(0); |
|
| 164 | + default: |
|
| 165 | + header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier); |
|
| 166 | + exit(0); |
|
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | $vlan = $deployment->getAttributes("managedsp:vlan")[0]['value'] ?? NULL; |
@@ -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 | |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
| 33 | 33 | $validator = new \web\lib\common\InputValidation(); |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 ) |
| 42 | 42 | ) |
| 43 | 43 | ) {*/ |
| 44 | - if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 44 | + if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 45 | 45 | { |
| 46 | 46 | $deployment = $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']); |
| 47 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier); |
|
| 47 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier); |
|
| 48 | 48 | exit(0); |
| 49 | 49 | } else { |
| 50 | 50 | throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!"); |
@@ -101,19 +101,19 @@ discard block |
||
| 101 | 101 | if (isset($_POST['agreement']) && $_POST['agreement'] == "true") { |
| 102 | 102 | $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1); |
| 103 | 103 | } |
| 104 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier); |
|
| 104 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier); |
|
| 105 | 105 | exit(0); |
| 106 | 106 | case web\lib\common\FormElements::BUTTON_DELETE: |
| 107 | 107 | $response = $deployment->setRADIUSconfig(); |
| 108 | 108 | if (in_array('OK', $response)) { |
| 109 | 109 | $deployment->deactivate(); |
| 110 | 110 | } |
| 111 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . |
|
| 111 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'. |
|
| 112 | 112 | $deployment->identifier); |
| 113 | 113 | exit(0); |
| 114 | 114 | case web\lib\common\FormElements::BUTTON_REMOVESP: |
| 115 | 115 | $deployment->remove(); |
| 116 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 116 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 117 | 117 | exit(0); |
| 118 | 118 | case web\lib\common\FormElements::BUTTON_ACTIVATE: |
| 119 | 119 | if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) { |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | if (in_array('OK', $response)) { |
| 122 | 122 | $deployment->activate(); |
| 123 | 123 | } |
| 124 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier); |
|
| 124 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'.$deployment->identifier); |
|
| 125 | 125 | exit(0); |
| 126 | 126 | } else { |
| 127 | 127 | throw new Exception("Activate button pushed without acknowledged ToUs!"); |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | } else { |
| 151 | 151 | $response = ['NOOP', 'NOOP']; |
| 152 | 152 | } |
| 153 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier); |
|
| 153 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'.$deployment->identifier); |
|
| 154 | 154 | exit(0); |
| 155 | 155 | default: |
| 156 | 156 | throw new Exception("Unknown button action requested!"); |
@@ -159,10 +159,10 @@ discard block |
||
| 159 | 159 | if (isset($_POST['command'])) { |
| 160 | 160 | switch ($_POST['command']) { |
| 161 | 161 | case web\lib\common\FormElements::BUTTON_CLOSE: |
| 162 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier) . '#profilebox_' . $deployment->identifier; |
|
| 162 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier).'#profilebox_'.$deployment->identifier; |
|
| 163 | 163 | exit(0); |
| 164 | 164 | default: |
| 165 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier); |
|
| 165 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier); |
|
| 166 | 166 | exit(0); |
| 167 | 167 | } |
| 168 | 168 | } |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | echo $uiElements->instLevelInfoBoxes($my_inst); |
| 190 | 190 | $deploymentOptions = $deployment->getAttributes(); |
| 191 | 191 | echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'> |
| 192 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 192 | + <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 193 | 193 | $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE); |
| 194 | 194 | ?> |
| 195 | 195 | <fieldset class='option_container' id='managedsp_override'> |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | <!-- input for VLAN identifier for home users--> |
| 224 | 224 | <td> |
| 225 | 225 | <span id='vlan_label'> |
| 226 | - <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?> |
|
| 226 | + <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?> |
|
| 227 | 227 | </span> |
| 228 | 228 | </td> |
| 229 | 229 | <td> |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | </fieldset> |
| 244 | 244 | |
| 245 | 245 | <?php |
| 246 | - echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>"; |
|
| 246 | + echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>"; |
|
| 247 | 247 | echo $deco->footer(); |
| 248 | 248 | |
| 249 | 249 | |
| 250 | 250 | \ No newline at end of file |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $auth = new \web\lib\admin\Authentication(); |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | echo '<br/>'; |
| 83 | 83 | echo _("In the 'Timestamp' column we show last update time."); |
| 84 | 84 | echo '<p/>'; |
| 85 | - echo _('To check eduroam database specification see') . |
|
| 86 | - ' <a target="_blank" href="https://monitor.eduroam.org/eduroam-database/v2/docs/eduroam-database-ver30112021.pdf">' . |
|
| 87 | - _('this document') . '</a><p/>'; |
|
| 85 | + echo _('To check eduroam database specification see'). |
|
| 86 | + ' <a target="_blank" href="https://monitor.eduroam.org/eduroam-database/v2/docs/eduroam-database-ver30112021.pdf">'. |
|
| 87 | + _('this document').'</a><p/>'; |
|
| 88 | 88 | echo _('If you cannot find your institution on this list it means that this institiution is not present in your upstream data.'); |
| 89 | 89 | echo '<p/>'; |
| 90 | 90 | $allAuthorizedFeds = $user->getAttributes("user:fedadmin"); |
@@ -93,11 +93,11 @@ discard block |
||
| 93 | 93 | ?> |
| 94 | 94 | |
| 95 | 95 | <select name="INST-list" id="INST-list"> |
| 96 | - <option value=""><?php echo _('---PLEASE CHOOSE---');?></option> |
|
| 96 | + <option value=""><?php echo _('---PLEASE CHOOSE---'); ?></option> |
|
| 97 | 97 | <?php |
| 98 | 98 | $instdata = array(); |
| 99 | 99 | foreach ($extInsts as $iid => $oneInst) { |
| 100 | - print '<option value="' . $iid . '">' . $oneInst['name'] . '</option>'; |
|
| 100 | + print '<option value="'.$iid.'">'.$oneInst['name'].'</option>'; |
|
| 101 | 101 | $instdata[$iid] = array(); |
| 102 | 102 | $instdata[$iid]['name'] = $oneInst['name']; |
| 103 | 103 | $instdata[$iid]['type'] = _('no data'); |
@@ -111,22 +111,22 @@ discard block |
||
| 111 | 111 | $contactdata = ''; |
| 112 | 112 | foreach ($oneInst['contacts'] as $oneContact) { |
| 113 | 113 | if ($contactdata != '') { |
| 114 | - $contactdata = $contactdata . '<br>'; |
|
| 114 | + $contactdata = $contactdata.'<br>'; |
|
| 115 | 115 | } |
| 116 | 116 | if ($oneContact['name']) { |
| 117 | - $contactdata = $contactdata . $oneContact['name']; |
|
| 117 | + $contactdata = $contactdata.$oneContact['name']; |
|
| 118 | 118 | } |
| 119 | 119 | if ($contactdata != '') { |
| 120 | - $contactdata = $contactdata . '<br>'; |
|
| 120 | + $contactdata = $contactdata.'<br>'; |
|
| 121 | 121 | } |
| 122 | 122 | if ($oneContact['mail']) { |
| 123 | - $contactdata = $contactdata . $oneContact['mail']; |
|
| 123 | + $contactdata = $contactdata.$oneContact['mail']; |
|
| 124 | 124 | } |
| 125 | 125 | if ($contactdata != '') { |
| 126 | - $contactdata = $contactdata . '<br>'; |
|
| 126 | + $contactdata = $contactdata.'<br>'; |
|
| 127 | 127 | } |
| 128 | 128 | if ($oneContact['phone']) { |
| 129 | - $contactdata = $contactdata . $oneContact['phone']; |
|
| 129 | + $contactdata = $contactdata.$oneContact['phone']; |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | if ($contactdata == '') { |
@@ -145,11 +145,11 @@ discard block |
||
| 145 | 145 | var instts = []; |
| 146 | 146 | <?php |
| 147 | 147 | foreach (array_keys($instdata) as $iid) { |
| 148 | - echo "instservers['" . $iid . "']='" . $instdata[$iid]['servers']. "';\n"; |
|
| 149 | - echo "instname['" . $iid . "']='" . $instdata[$iid]['name']. "';\n"; |
|
| 150 | - echo "insttype['" . $iid . "']='" . $instdata[$iid]['type']. "';\n"; |
|
| 151 | - echo "instcontact['" . $iid . "']='" . $instdata[$iid]['contacts']. "';\n"; |
|
| 152 | - echo "instts['" . $iid . "']='" . $instdata[$iid]['ts']. "';\n"; |
|
| 148 | + echo "instservers['".$iid."']='".$instdata[$iid]['servers']."';\n"; |
|
| 149 | + echo "instname['".$iid."']='".$instdata[$iid]['name']."';\n"; |
|
| 150 | + echo "insttype['".$iid."']='".$instdata[$iid]['type']."';\n"; |
|
| 151 | + echo "instcontact['".$iid."']='".$instdata[$iid]['contacts']."';\n"; |
|
| 152 | + echo "instts['".$iid."']='".$instdata[$iid]['ts']."';\n"; |
|
| 153 | 153 | } |
| 154 | 154 | ?> |
| 155 | 155 | $(document).ready(function(){ |
@@ -171,18 +171,18 @@ discard block |
||
| 171 | 171 | <div id="instdata_area"> |
| 172 | 172 | <table> |
| 173 | 173 | <tr><th align="left" width="350"> |
| 174 | - <?php echo _('Name');?> |
|
| 174 | + <?php echo _('Name'); ?> |
|
| 175 | 175 | </th><th align="left" width="100"> |
| 176 | - <?php echo _('Type');?> |
|
| 176 | + <?php echo _('Type'); ?> |
|
| 177 | 177 | </th> |
| 178 | 178 | <th align="left" width="200"> |
| 179 | - <?php echo _('Servers');?> |
|
| 179 | + <?php echo _('Servers'); ?> |
|
| 180 | 180 | </th> |
| 181 | 181 | <th align="left" width="200"> |
| 182 | - <?php echo _('Contact data');?> |
|
| 182 | + <?php echo _('Contact data'); ?> |
|
| 183 | 183 | </th> |
| 184 | 184 | <th align="left" width="100"> |
| 185 | - <?php echo _('Timestamp');?> |
|
| 185 | + <?php echo _('Timestamp'); ?> |
|
| 186 | 186 | </th> |
| 187 | 187 | </tr> |
| 188 | 188 | <tr id="toshow"></tr> |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | /* Messages */ |
| 92 | 92 | $messages = [ |
| 93 | 93 | 'WRONG_SUBJECT' => _('Submitted Certificate Signing Request contains subject field that does not start with') . ' ' . |
| 94 | - $subject_prefix . '<br>' . _("See CSR generation rules below."), |
|
| 94 | + $subject_prefix . '<br>' . _("See CSR generation rules below."), |
|
| 95 | 95 | 'WRONG_CRL' => _('Submitted Certificate Signing Request is broken - unable to extract the public key from CSR') |
| 96 | 96 | ]; |
| 97 | 97 | $settings = array(); |
@@ -171,16 +171,16 @@ discard block |
||
| 171 | 171 | $ou = $serverInfo["names"][$langInstance->getLang()]; |
| 172 | 172 | } |
| 173 | 173 | print($ou); |
| 174 | - $modou = 0; |
|
| 175 | - if (str_contains($ou, ',')) { |
|
| 176 | - $modou = 1; |
|
| 177 | - $ou = str_replace(",", "/,", $ou); |
|
| 178 | - } |
|
| 179 | - $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 180 | - if (strlen($ou) >= 64) { |
|
| 181 | - $ou = substr($ou, 0, 64); |
|
| 182 | - $modou += 2; |
|
| 183 | - } |
|
| 174 | + $modou = 0; |
|
| 175 | + if (str_contains($ou, ',')) { |
|
| 176 | + $modou = 1; |
|
| 177 | + $ou = str_replace(",", "/,", $ou); |
|
| 178 | + } |
|
| 179 | + $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 180 | + if (strlen($ou) >= 64) { |
|
| 181 | + $ou = substr($ou, 0, 64); |
|
| 182 | + $modou += 2; |
|
| 183 | + } |
|
| 184 | 184 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 185 | 185 | $serverList = explode(",", $serverInfo["servers"]); |
| 186 | 186 | $DN[] = "CN=" . $serverList[0]; |
@@ -205,20 +205,20 @@ discard block |
||
| 205 | 205 | echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
| 206 | 206 | echo "<ul>"; |
| 207 | 207 | echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
| 208 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 209 | - if ($modou > 0) { |
|
| 210 | - echo " ("; |
|
| 208 | + echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 209 | + if ($modou > 0) { |
|
| 210 | + echo " ("; |
|
| 211 | 211 | echo _("Organization field adjusted"). ': '; |
| 212 | - $desc = array(); |
|
| 213 | - if ($modou >= 2) { |
|
| 214 | - $desc[] = _("truncated to 64 chars"); |
|
| 215 | - } |
|
| 216 | - if ($modou == 1 || $modou == 3) { |
|
| 217 | - $desc[] = _("commas escaped"); |
|
| 212 | + $desc = array(); |
|
| 213 | + if ($modou >= 2) { |
|
| 214 | + $desc[] = _("truncated to 64 chars"); |
|
| 215 | + } |
|
| 216 | + if ($modou == 1 || $modou == 3) { |
|
| 217 | + $desc[] = _("commas escaped"); |
|
| 218 | 218 | } |
| 219 | - echo implode(', ', $desc); |
|
| 220 | - echo ")"; |
|
| 221 | - } |
|
| 219 | + echo implode(', ', $desc); |
|
| 220 | + echo ")"; |
|
| 221 | + } |
|
| 222 | 222 | echo "</li>"; |
| 223 | 223 | echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
| 224 | 224 | echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | <?php if (empty($policies)) {?> |
| 374 | 374 | eduroam IdP/SP |
| 375 | 375 | <?php } else { |
| 376 | - echo implode(', ', $policies); |
|
| 376 | + echo implode(', ', $policies); |
|
| 377 | 377 | }?> |
| 378 | 378 | </span> |
| 379 | 379 | </h3> |
@@ -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(); |
@@ -90,23 +90,23 @@ discard block |
||
| 90 | 90 | $subject_prefix = implode(', ', array_reverse($DN)); |
| 91 | 91 | /* Messages */ |
| 92 | 92 | $messages = [ |
| 93 | - 'WRONG_SUBJECT' => _('Submitted Certificate Signing Request contains subject field that does not start with') . ' ' . |
|
| 94 | - $subject_prefix . '<br>' . _("See CSR generation rules below."), |
|
| 93 | + 'WRONG_SUBJECT' => _('Submitted Certificate Signing Request contains subject field that does not start with').' '. |
|
| 94 | + $subject_prefix.'<br>'._("See CSR generation rules below."), |
|
| 95 | 95 | 'WRONG_CRL' => _('Submitted Certificate Signing Request is broken - unable to extract the public key from CSR') |
| 96 | 96 | ]; |
| 97 | 97 | $settings = array(); |
| 98 | - if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') { |
|
| 99 | - print '<h3 id="errorbox"><font color="red">'. $messages[$_SESSION['CSR_ERRORS']].'</font></h3>'; |
|
| 98 | + if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') { |
|
| 99 | + print '<h3 id="errorbox"><font color="red">'.$messages[$_SESSION['CSR_ERRORS']].'</font></h3>'; |
|
| 100 | 100 | unset($_SESSION['CSR_ERRORS']); |
| 101 | 101 | } |
| 102 | - if (isset($_SESSION['FORM_SETTINGS']) && $_SESSION['FORM_SETTINGS'] != '') { |
|
| 102 | + if (isset($_SESSION['FORM_SETTINGS']) && $_SESSION['FORM_SETTINGS'] != '') { |
|
| 103 | 103 | $settings = $_SESSION['FORM_SETTINGS']; |
| 104 | 104 | unset($_SESSION['FORM_SETTINGS']); |
| 105 | 105 | } |
| 106 | 106 | if (empty($settings) && isset($_POST['LEVEL'])) { |
| 107 | 107 | $settings = array('LEVEL' => $_POST['LEVEL'], 'NRO-list' => $_POST['NRO-list'], 'INST-list' => $_POST['INST-list']); |
| 108 | 108 | } |
| 109 | - if ( isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) { |
|
| 109 | + if (isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) { |
|
| 110 | 110 | // basic sanity checks before we hand this over to openssl |
| 111 | 111 | $sanitisedCsr = $validator->string($_POST['CSR'] ?? "", TRUE); |
| 112 | 112 | //print $sanitisedCsr; |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $dc = array(); |
| 123 | 123 | if (!empty($subject_keys) && $subject_keys[0] == 'DC' && $subject['DC']) { |
| 124 | 124 | foreach ($subject['DC'] as $v) { |
| 125 | - $dc[] = 'DC=' . $v; |
|
| 125 | + $dc[] = 'DC='.$v; |
|
| 126 | 126 | } |
| 127 | 127 | if ($DN !== array_reverse($dc)) { |
| 128 | 128 | $dc = array(); |
@@ -142,12 +142,12 @@ discard block |
||
| 142 | 142 | } |
| 143 | 143 | $fed = $validator->existingFederation($_POST['NRO-list']); |
| 144 | 144 | $country = strtoupper($fed->tld); |
| 145 | - $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country ; |
|
| 145 | + $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country; |
|
| 146 | 146 | $DN[] = "C=$code"; |
| 147 | - $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[$country]['name']); |
|
| 147 | + $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[$country]['name']); |
|
| 148 | 148 | $serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld); |
| 149 | 149 | $serverList = explode(",", array_key_first($serverInfo)); |
| 150 | - $DN[] = "CN=" . $serverList[0]; |
|
| 150 | + $DN[] = "CN=".$serverList[0]; |
|
| 151 | 151 | $policies[] = "eduroam IdP"; |
| 152 | 152 | $policies[] = "eduroam SP"; |
| 153 | 153 | $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"]; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | throw new Exception(sprintf("Sorry: you are not %s admin for the %s requested in the form.", $uiElements->nomenclatureFed, $uiElements->nomenclatureFed)); |
| 163 | 163 | } |
| 164 | 164 | $country = strtoupper($matches[1]); |
| 165 | - $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country ; |
|
| 165 | + $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country; |
|
| 166 | 166 | $DN[] = "C=$code"; |
| 167 | 167 | $serverInfo = $extInsts[$_POST['INST-list']]; |
| 168 | 168 | if (isset($serverInfo["names"]["en"])) { |
@@ -176,14 +176,14 @@ discard block |
||
| 176 | 176 | $modou = 1; |
| 177 | 177 | $ou = str_replace(",", "/,", $ou); |
| 178 | 178 | } |
| 179 | - $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 179 | + $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 180 | 180 | if (strlen($ou) >= 64) { |
| 181 | 181 | $ou = substr($ou, 0, 64); |
| 182 | 182 | $modou += 2; |
| 183 | 183 | } |
| 184 | 184 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 185 | 185 | $serverList = explode(",", $serverInfo["servers"]); |
| 186 | - $DN[] = "CN=" . $serverList[0]; |
|
| 186 | + $DN[] = "CN=".$serverList[0]; |
|
| 187 | 187 | switch ($serverInfo["type"]) { |
| 188 | 188 | case core\IdP::TYPE_IDPSP: |
| 189 | 189 | $policies[] = "eduroam IdP"; |
@@ -202,13 +202,13 @@ discard block |
||
| 202 | 202 | default: |
| 203 | 203 | throw new Exception("Sorry: Unknown level of issuance requested."); |
| 204 | 204 | } |
| 205 | - echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
|
| 205 | + echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties"); |
|
| 206 | 206 | echo "<ul>"; |
| 207 | - echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
|
| 208 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 207 | + echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>"; |
|
| 208 | + echo "<li>"._("Distinguished Name: ").implode(", ", $DN); |
|
| 209 | 209 | if ($modou > 0) { |
| 210 | 210 | echo " ("; |
| 211 | - echo _("Organization field adjusted"). ': '; |
|
| 211 | + echo _("Organization field adjusted").': '; |
|
| 212 | 212 | $desc = array(); |
| 213 | 213 | if ($modou >= 2) { |
| 214 | 214 | $desc[] = _("truncated to 64 chars"); |
@@ -220,8 +220,8 @@ discard block |
||
| 220 | 220 | echo ")"; |
| 221 | 221 | } |
| 222 | 222 | echo "</li>"; |
| 223 | - echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
|
| 224 | - echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
|
| 223 | + echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>"; |
|
| 224 | + echo "<li>"._("Requester Contact Details: ").$firstName." <".$firstMail.">"."</li>"; |
|
| 225 | 225 | echo "</ul></p>"; |
| 226 | 226 | |
| 227 | 227 | $vettedCsr = $validator->string($_POST['CSR'], true); |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | $loggerInstance->debug(2, $DN, "CERT DN: ", "\n"); |
| 238 | 238 | // our certs can be good for max 5 years |
| 239 | 239 | $fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays); |
| 240 | - echo "<p>" . _("The certificate was requested.") . "</p>"; |
|
| 240 | + echo "<p>"._("The certificate was requested.")."</p>"; |
|
| 241 | 241 | ?> |
| 242 | 242 | <form action="overview_certificates.php" method="GET"> |
| 243 | 243 | <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button> |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | switch (count($feds)) { |
| 256 | 256 | case 0: |
| 257 | 257 | echo "<div>"; |
| 258 | - 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.")); |
|
| 258 | + 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.")); |
|
| 259 | 259 | echo "</div>"; |
| 260 | 260 | break; |
| 261 | 261 | case 1: |
@@ -263,22 +263,22 @@ discard block |
||
| 263 | 263 | if (empty($settings) || (isset($settings['LEVEL']) && $settings['LEVEL'] == 'NRO')) { |
| 264 | 264 | echo ' checked'; |
| 265 | 265 | } |
| 266 | - echo '>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 267 | - echo " <strong>" . $cat->knownFederations[$feds[0]->tld]['name'] . "</strong>"; |
|
| 268 | - echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>'; |
|
| 266 | + echo '>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 267 | + echo " <strong>".$cat->knownFederations[$feds[0]->tld]['name']."</strong>"; |
|
| 268 | + echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>'; |
|
| 269 | 269 | break; |
| 270 | 270 | default: |
| 271 | 271 | echo '<input type="radio" name="LEVEL" id="NRO" value="NRO"'; |
| 272 | 272 | if (empty($settings) || isset($settings['LEVEL']) && $settings['LEVEL'] == 'NRO') { |
| 273 | 273 | echo ' checked'; |
| 274 | 274 | } |
| 275 | - echo '>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>'; |
|
| 275 | + echo '>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>'; |
|
| 276 | 276 | ?> |
| 277 | 277 | <select name="NRO-list" id="NRO-list"> |
| 278 | 278 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 279 | 279 | <?php |
| 280 | 280 | foreach ($feds as $oneFed) { |
| 281 | - echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld]['name'] . "</option>"; |
|
| 281 | + echo '<option value="'.strtoupper($oneFed->tld).'">'.$cat->knownFederations[$oneFed->tld]['name']."</option>"; |
|
| 282 | 282 | #echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>"; |
| 283 | 283 | |
| 284 | 284 | } |
@@ -291,18 +291,18 @@ discard block |
||
| 291 | 291 | <script> |
| 292 | 292 | var instservers = []; |
| 293 | 293 | var instpolicies = []; |
| 294 | - var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo));?>'; |
|
| 294 | + var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?>'; |
|
| 295 | 295 | <?php |
| 296 | 296 | $allIdPs = []; |
| 297 | 297 | foreach ($allAuthorizedFeds as $oneFed) { |
| 298 | 298 | foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) { |
| 299 | - $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["name"]; |
|
| 300 | - echo "instservers['" . $id . "']='" . str_replace(",", ", ", $oneIdP["servers"]) . "';\n"; |
|
| 301 | - echo "instpolicies['" . $id . "']='"; |
|
| 299 | + $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["name"]; |
|
| 300 | + echo "instservers['".$id."']='".str_replace(",", ", ", $oneIdP["servers"])."';\n"; |
|
| 301 | + echo "instpolicies['".$id."']='"; |
|
| 302 | 302 | if ($oneIdP["type"] == 'IdPSP') { |
| 303 | 303 | echo "eduroam IdP/SP"; |
| 304 | 304 | } else { |
| 305 | - echo "eduroam " . $oneIdP["type"]; |
|
| 305 | + echo "eduroam ".$oneIdP["type"]; |
|
| 306 | 306 | } |
| 307 | 307 | echo "';\n"; |
| 308 | 308 | } |
@@ -348,9 +348,9 @@ discard block |
||
| 348 | 348 | <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option> |
| 349 | 349 | <?php |
| 350 | 350 | foreach ($allIdPs as $id => $name) { |
| 351 | - echo '<option value="' . $id . '"'; |
|
| 351 | + echo '<option value="'.$id.'"'; |
|
| 352 | 352 | if (isset($settings['INST-list']) && $settings['INST-list'] == $id) { echo ' selected'; } |
| 353 | - echo '>' . $name . "</option>"; |
|
| 353 | + echo '>'.$name."</option>"; |
|
| 354 | 354 | } |
| 355 | 355 | ?> |
| 356 | 356 | </select> |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | <?php |
| 365 | 365 | echo _('According to the above settings you will receive') |
| 366 | 366 | ?> |
| 367 | - <span id='certlevel'><?php echo _('NRO level certificate');?></span> |
|
| 367 | + <span id='certlevel'><?php echo _('NRO level certificate'); ?></span> |
|
| 368 | 368 | |
| 369 | 369 | for server names: |
| 370 | 370 | <span id='serversinfo'><?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?></span> |
@@ -380,12 +380,12 @@ discard block |
||
| 380 | 380 | <?php |
| 381 | 381 | } else { |
| 382 | 382 | echo "<div>"; |
| 383 | - 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); |
|
| 383 | + 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); |
|
| 384 | 384 | echo "</div>"; |
| 385 | 385 | } |
| 386 | 386 | ?> |
| 387 | 387 | <?php |
| 388 | - echo '<div id="ondb"><h4 style="margin: 0">' . _("Can't you find an institiutin on the select list above?") . '</h4>'; |
|
| 388 | + echo '<div id="ondb"><h4 style="margin: 0">'._("Can't you find an institiutin on the select list above?").'</h4>'; |
|
| 389 | 389 | echo _("Most likely we do not have required data on this institution in the eduroam database."); |
| 390 | 390 | echo '<br/>'; |
| 391 | 391 | ?> |
@@ -399,10 +399,10 @@ discard block |
||
| 399 | 399 | <h2><?php echo _("2. CSR generation"); ?></h2> |
| 400 | 400 | <p> |
| 401 | 401 | <?php |
| 402 | - echo _("The CSR subject field has to start with ") .'<b>' . $subject_prefix . '</b><br>'; |
|
| 402 | + echo _("The CSR subject field has to start with ").'<b>'.$subject_prefix.'</b><br>'; |
|
| 403 | 403 | echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p> |
| 404 | 404 | <?php |
| 405 | - echo "<b>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</b>"; |
|
| 405 | + echo "<b>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</b>"; |
|
| 406 | 406 | ?> |
| 407 | 407 | <h2><?php echo _("3. Submission"); ?></h2> |
| 408 | 408 | <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/> |
