GEANT /
CAT
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | sprintf(_("%s: Do not terminate EAP"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-noterm", |
| 136 | 136 | sprintf(_("%s: max users per profile"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-maxusers", |
| 137 | 137 | sprintf(_("Mint %s with CA on creation"), $this->nomenclatureIdP) => "fed:minted_ca_file", |
| 138 | - sprintf(_("OpenRoaming: Allow %s Opt-In"),$this->nomenclatureParticipant) => "fed:openroaming", |
|
| 138 | + sprintf(_("OpenRoaming: Allow %s Opt-In"), $this->nomenclatureParticipant) => "fed:openroaming", |
|
| 139 | 139 | _("OpenRoaming: Custom NAPTR Target") => "fed:openroaming_customtarget", |
| 140 | 140 | $ssidText => "media:SSID", |
| 141 | 141 | $passpointOiText => "media:consortium_OI", |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $find = array_keys($displayNames, $input, TRUE); |
| 148 | 148 | |
| 149 | 149 | if (count($find) == 0) { // this is an error! throw an Exception |
| 150 | - throw new \Exception("The translation of an option name was requested, but the option is not known to the system: " . htmlentities($input)); |
|
| 150 | + throw new \Exception("The translation of an option name was requested, but the option is not known to the system: ".htmlentities($input)); |
|
| 151 | 151 | } |
| 152 | 152 | \core\common\Entity::outOfThePotatoes(); |
| 153 | 153 | // none of the strings have HTML in them, only translators can provide own text for it -> no threat, but complained about by the security review |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | foreach ($optionlist as $option) { |
| 171 | 171 | $type = $optioninfo->optionType($option['name']); |
| 172 | - if (preg_match('/^' . $class . '/', $option['name']) && $option['level'] == "$level") { |
|
| 172 | + if (preg_match('/^'.$class.'/', $option['name']) && $option['level'] == "$level") { |
|
| 173 | 173 | // all non-multilang attribs get this assignment ... |
| 174 | 174 | $language = ""; |
| 175 | 175 | $content = $option['value']; |
@@ -187,19 +187,19 @@ discard block |
||
| 187 | 187 | $locationMarkers[] = $coords; |
| 188 | 188 | break; |
| 189 | 189 | case "file": |
| 190 | - $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td>"; |
|
| 190 | + $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td>"; |
|
| 191 | 191 | switch ($option['name']) { |
| 192 | 192 | case "general:logo_file": |
| 193 | 193 | case "fed:logo_file": |
| 194 | - $retval .= $this->previewImageinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']); |
|
| 194 | + $retval .= $this->previewImageinHTML('ROWID-'.$option['level'].'-'.$option['row_id']); |
|
| 195 | 195 | break; |
| 196 | 196 | case "eap:ca_file": |
| 197 | 197 | // fall-through intended: display both the same way |
| 198 | 198 | case "fed:minted_ca_file": |
| 199 | - $retval .= $this->previewCAinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']); |
|
| 199 | + $retval .= $this->previewCAinHTML('ROWID-'.$option['level'].'-'.$option['row_id']); |
|
| 200 | 200 | break; |
| 201 | 201 | case "support:info_file": |
| 202 | - $retval .= $this->previewInfoFileinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']); |
|
| 202 | + $retval .= $this->previewInfoFileinHTML('ROWID-'.$option['level'].'-'.$option['row_id']); |
|
| 203 | 203 | break; |
| 204 | 204 | default: |
| 205 | 205 | } |
@@ -209,10 +209,10 @@ discard block |
||
| 209 | 209 | // do not display the option at all; it gets auto-set by the ProfileSilverbullet constructor and doesn't have to be seen |
| 210 | 210 | break; |
| 211 | 211 | } |
| 212 | - $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>"; |
|
| 212 | + $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>".($content == "on" ? _("on") : _("off"))."</strong></td></tr>"; |
|
| 213 | 213 | break; |
| 214 | 214 | default: |
| 215 | - $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>"; |
|
| 215 | + $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>$content</strong></td></tr>"; |
|
| 216 | 216 | } |
| 217 | 217 | } |
| 218 | 218 | } |
@@ -221,11 +221,11 @@ discard block |
||
| 221 | 221 | $locationCount = 0; |
| 222 | 222 | foreach ($locationMarkers as $g) { |
| 223 | 223 | $locationCount++; |
| 224 | - $marker .= '<marker name="' . $locationCount . '" lat="' . $g['lat'] . '" lng="' . $g['lon'] . '" />'; |
|
| 224 | + $marker .= '<marker name="'.$locationCount.'" lat="'.$g['lat'].'" lng="'.$g['lon'].'" />'; |
|
| 225 | 225 | } |
| 226 | 226 | $marker .= '<\/markers>'; // some validator says this should be escaped |
| 227 | 227 | $jMarker = json_encode($locationMarkers); |
| 228 | - $retval .= '<tr><td><script>markers=\'' . $marker . '\'; jmarkers = \'' . $jMarker . '\';</script></td><td></td><td></td></tr>'; |
|
| 228 | + $retval .= '<tr><td><script>markers=\''.$marker.'\'; jmarkers = \''.$jMarker.'\';</script></td><td></td><td></td></tr>'; |
|
| 229 | 229 | } |
| 230 | 230 | \core\common\Entity::outOfThePotatoes(); |
| 231 | 231 | return $retval; |
@@ -241,11 +241,11 @@ discard block |
||
| 241 | 241 | \core\common\Entity::intoThePotatoes(); |
| 242 | 242 | $idpoptions = $myInst->getAttributes(); |
| 243 | 243 | $retval = "<div class='infobox'> |
| 244 | - <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant) . "</h2> |
|
| 244 | + <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant)."</h2> |
|
| 245 | 245 | <table> |
| 246 | 246 | <tr> |
| 247 | 247 | <td> |
| 248 | - " . _("Country:") . " |
|
| 248 | + " . _("Country:")." |
|
| 249 | 249 | </td> |
| 250 | 250 | <td> |
| 251 | 251 | </td> |
@@ -255,16 +255,16 @@ discard block |
||
| 255 | 255 | $retval .= $myFed->name; |
| 256 | 256 | $retval .= "</strong> |
| 257 | 257 | </td> |
| 258 | - </tr>" . $this->infoblock($idpoptions, "general", "IdP") . " |
|
| 258 | + </tr>" . $this->infoblock($idpoptions, "general", "IdP")." |
|
| 259 | 259 | </table> |
| 260 | 260 | </div>"; |
| 261 | 261 | |
| 262 | 262 | $blocks = [["support", _("Global Helpdesk Details")], ["media", _("Media Properties")]]; |
| 263 | 263 | foreach ($blocks as $block) { |
| 264 | 264 | $retval .= "<div class='infobox'> |
| 265 | - <h2>" . $block[1] . "</h2> |
|
| 265 | + <h2>" . $block[1]."</h2> |
|
| 266 | 266 | <table>" . |
| 267 | - $this->infoblock($idpoptions, $block[0], "IdP") . |
|
| 267 | + $this->infoblock($idpoptions, $block[0], "IdP"). |
|
| 268 | 268 | "</table> |
| 269 | 269 | </div>"; |
| 270 | 270 | } |
@@ -279,12 +279,12 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | private function displaySize(int $number) { |
| 281 | 281 | if ($number > 1024 * 1024) { |
| 282 | - return round($number / 1024 / 1024, 2) . " MiB"; |
|
| 282 | + return round($number / 1024 / 1024, 2)." MiB"; |
|
| 283 | 283 | } |
| 284 | 284 | if ($number > 1024) { |
| 285 | - return round($number / 1024, 2) . " KiB"; |
|
| 285 | + return round($number / 1024, 2)." KiB"; |
|
| 286 | 286 | } |
| 287 | - return $number . " B"; |
|
| 287 | + return $number." B"; |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | /** |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | $caExpiryTrashhold = \config\ConfAssistant::CERT_WARNINGS['expiry_warning']; |
| 340 | 340 | $rawResult = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE); |
| 341 | 341 | if (is_bool($rawResult)) { // we didn't actually get a CA! |
| 342 | - $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the certificate from the database!") . "</div>"; |
|
| 342 | + $retval = "<div class='ca-summary'>"._("There was an error while retrieving the certificate from the database!")."</div>"; |
|
| 343 | 343 | \core\common\Entity::outOfThePotatoes(); |
| 344 | 344 | return $retval; |
| 345 | 345 | } |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']); |
| 357 | 357 | $details['name'] = preg_replace('/\//', "", $details['name']); |
| 358 | - $certstatus = ( $details['root'] == 1 ? "R" : "I"); |
|
| 359 | - $certTooltip = ( $details['root'] == 1 ? _("Root CA") : _("Intermediate CA")); |
|
| 358 | + $certstatus = ($details['root'] == 1 ? "R" : "I"); |
|
| 359 | + $certTooltip = ($details['root'] == 1 ? _("Root CA") : _("Intermediate CA")); |
|
| 360 | 360 | $innerbgColor = "#0000ff"; |
| 361 | 361 | $leftBorderColor = "#00ff00"; |
| 362 | 362 | $message = ""; |
@@ -364,35 +364,35 @@ discard block |
||
| 364 | 364 | $leftBorderColor = "red"; |
| 365 | 365 | $message = _("This is a <strong>SERVER</strong> certificate!"); |
| 366 | 366 | if (\config\ConfAssistant::CERT_GUIDELINES !== '') { |
| 367 | - $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>"; |
|
| 367 | + $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>"; |
|
| 368 | 368 | } |
| 369 | 369 | $message .= "<br/>"; |
| 370 | - $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . $message . $details['name'] . "</div>"; |
|
| 370 | + $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>".$message.$details['name']."</div>"; |
|
| 371 | 371 | \core\common\Entity::outOfThePotatoes(); |
| 372 | 372 | return $retval; |
| 373 | 373 | } |
| 374 | 374 | $now = time(); |
| 375 | 375 | if ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_critical'] > $details['full_details']['validTo_time_t']) { |
| 376 | 376 | $leftBorderColor = "red"; |
| 377 | - $message = _("Certificate expired!") . "<br>"; |
|
| 378 | - } elseif($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning'] > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) { |
|
| 377 | + $message = _("Certificate expired!")."<br>"; |
|
| 378 | + } elseif ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning'] > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) { |
|
| 379 | 379 | if ($leftBorderColor == "#00ff00") { |
| 380 | 380 | $leftBorderColor = "yellow"; |
| 381 | 381 | } |
| 382 | - $message = _("Certificate close to expiry!") . "<br/>"; |
|
| 382 | + $message = _("Certificate close to expiry!")."<br/>"; |
|
| 383 | 383 | } |
| 384 | 384 | |
| 385 | 385 | if ($details['root'] == 1 && $details['basicconstraints_set'] == 0) { |
| 386 | 386 | if ($leftBorderColor == "#00ff00") { |
| 387 | 387 | $leftBorderColor = "yellow"; |
| 388 | 388 | } |
| 389 | - $message .= "<div style='max-width: 25em'><strong>" . _("Improper root certificate, required critical CA extension missing, will not reliably install!") . "</strong>"; |
|
| 389 | + $message .= "<div style='max-width: 25em'><strong>"._("Improper root certificate, required critical CA extension missing, will not reliably install!")."</strong>"; |
|
| 390 | 390 | if (\config\ConfAssistant::CERT_GUIDELINES !== '') { |
| 391 | - $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>"; |
|
| 391 | + $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>"; |
|
| 392 | 392 | } |
| 393 | 393 | $message .= "</div><br/>"; |
| 394 | 394 | } |
| 395 | - $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $message . $details['name'] . "<br>" . $this->displayName('eap:ca_vailduntil') . " " . gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t']) . " UTC</div>"; |
|
| 395 | + $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>".$message.$details['name']."<br>".$this->displayName('eap:ca_vailduntil')." ".gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t'])." UTC</div>"; |
|
| 396 | 396 | \core\common\Entity::outOfThePotatoes(); |
| 397 | 397 | return $retval; |
| 398 | 398 | } |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | */ |
| 406 | 406 | public function previewImageinHTML($imageReference) { |
| 407 | 407 | \core\common\Entity::intoThePotatoes(); |
| 408 | - $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=" . $imageReference . "' alt='" . _("Preview of logo file") . "'/>"; |
|
| 408 | + $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=".$imageReference."' alt='"._("Preview of logo file")."'/>"; |
|
| 409 | 409 | \core\common\Entity::outOfThePotatoes(); |
| 410 | 410 | return $retval; |
| 411 | 411 | } |
@@ -422,13 +422,13 @@ discard block |
||
| 422 | 422 | $ref = $validator->databaseReference($fileReference); |
| 423 | 423 | $fileBlob = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE); |
| 424 | 424 | if (is_bool($fileBlob)) { // we didn't actually get a file! |
| 425 | - $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the file from the database!") . "</div>"; |
|
| 425 | + $retval = "<div class='ca-summary'>"._("There was an error while retrieving the file from the database!")."</div>"; |
|
| 426 | 426 | \core\common\Entity::outOfThePotatoes(); |
| 427 | 427 | return $retval; |
| 428 | 428 | } |
| 429 | 429 | $decodedFileBlob = base64_decode($fileBlob); |
| 430 | 430 | $fileinfo = new \finfo(); |
| 431 | - $retval = "<div class='ca-summary'>" . _("File exists") . " (" . $fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE) . ", " . $this->displaySize(strlen($decodedFileBlob)) . ")<br/><a href='inc/filepreview.php?id=$fileReference'>" . _("Preview") . "</a></div>"; |
|
| 431 | + $retval = "<div class='ca-summary'>"._("File exists")." (".$fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE).", ".$this->displaySize(strlen($decodedFileBlob)).")<br/><a href='inc/filepreview.php?id=$fileReference'>"._("Preview")."</a></div>"; |
|
| 432 | 432 | \core\common\Entity::outOfThePotatoes(); |
| 433 | 433 | return $retval; |
| 434 | 434 | } |
@@ -585,8 +585,8 @@ discard block |
||
| 585 | 585 | return ""; |
| 586 | 586 | } |
| 587 | 587 | |
| 588 | - $loggerInstance->debug(4, "Consortium logo is at: " . ROOT . "/web/resources/images/consortium_logo_large.png"); |
|
| 589 | - $logogd = imagecreatefrompng(ROOT . "/web/resources/images/consortium_logo_large.png"); |
|
| 588 | + $loggerInstance->debug(4, "Consortium logo is at: ".ROOT."/web/resources/images/consortium_logo_large.png"); |
|
| 589 | + $logogd = imagecreatefrompng(ROOT."/web/resources/images/consortium_logo_large.png"); |
|
| 590 | 590 | if ($logogd === FALSE) { // consortium logo is bogus; don't do anything |
| 591 | 591 | return ""; |
| 592 | 592 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | imagecolorallocate($whiteimage, 255, 255, 255); |
| 613 | 613 | // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected |
| 614 | 614 | $targetplacementx = (int) ($symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize + 1) / 2) / $symbolsize)); |
| 615 | - $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1 ) / 2) / $symbolsize)); |
|
| 615 | + $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1) / 2) / $symbolsize)); |
|
| 616 | 616 | imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize); |
| 617 | 617 | imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]); |
| 618 | 618 | ob_start(); |
@@ -662,9 +662,9 @@ discard block |
||
| 662 | 662 | $message = "Your configuration appears to be fine."; |
| 663 | 663 | break; |
| 664 | 664 | default: |
| 665 | - throw new Exception("The result code level " . $test->test_result['global'] . " is not defined!"); |
|
| 665 | + throw new Exception("The result code level ".$test->test_result['global']." is not defined!"); |
|
| 666 | 666 | } |
| 667 | - $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>" . $message . "<br>See below for details<br><hr>"); |
|
| 667 | + $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>"); |
|
| 668 | 668 | foreach ($test->out as $testValue) { |
| 669 | 669 | foreach ($testValue as $o) { |
| 670 | 670 | $out .= $this->boxFlexible($o['level'], $o['message']); |
@@ -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(); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $fed = new \core\Federation($inst->federation); |
| 53 | 53 | $allowSb = $fed->getAttributes("fed:silverbullet"); |
| 54 | 54 | if (count($allowSb) == 0) { |
| 55 | - 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!"); |
|
| 55 | + 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 | 56 | } |
| 57 | 57 | // okay, new SB profiles are allowed. |
| 58 | 58 | // but is there a support:email attribute on inst level? |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | // Create one. |
| 64 | 64 | $newProfile = $inst->newProfile(core\AbstractProfile::PROFILETYPE_SILVERBULLET); |
| 65 | 65 | // and modify the REQUEST_URI to add the new profile ID |
| 66 | - $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier; |
|
| 66 | + $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier; |
|
| 67 | 67 | $_GET['profile_id'] = $newProfile->identifier; |
| 68 | 68 | $profile = $newProfile; |
| 69 | 69 | } else { |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | if (isset($_POST['command'])) { |
| 89 | 89 | switch ($_POST['command']) { |
| 90 | 90 | case \web\lib\common\FormElements::BUTTON_CLOSE: |
| 91 | - header("Location: overview_org.php?inst_id=" . $inst->identifier); |
|
| 91 | + header("Location: overview_org.php?inst_id=".$inst->identifier); |
|
| 92 | 92 | break; |
| 93 | 93 | case \web\lib\common\FormElements::BUTTON_TERMSOFUSE_ACCEPTED: |
| 94 | 94 | if (isset($_POST['agreement']) && $_POST['agreement'] == 'true') { |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | break; |
| 132 | 132 | } |
| 133 | 133 | $properName = $validator->syntaxConformUser($elements[0]); |
| 134 | - $properDate = new DateTime($elements[1] . " 00:00:00"); |
|
| 134 | + $properDate = new DateTime($elements[1]." 00:00:00"); |
|
| 135 | 135 | $numberOfActivations = $elements[2] ?? 5; |
| 136 | 136 | $number = $validator->integer($numberOfActivations); |
| 137 | 137 | if ($number === FALSE) { // invalid input received, default to sane |
@@ -234,18 +234,18 @@ discard block |
||
| 234 | 234 | // warn and ask for confirmation unless already confirmed |
| 235 | 235 | if (!isset($_POST['insecureconfirm']) || $_POST['insecureconfirm'] != "CONFIRM") { |
| 236 | 236 | echo $deco->pageheader(_("Insecure mail domain!"), "ADMIN-IDP-USERS"); |
| 237 | - 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>"; |
|
| 238 | - 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>"; |
|
| 239 | - echo "<p>" . _("Do you want the system to send this mail anyway?") . "</p>"; |
|
| 237 | + 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>"; |
|
| 238 | + 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>"; |
|
| 239 | + echo "<p>"._("Do you want the system to send this mail anyway?")."</p>"; |
|
| 240 | 240 | echo $formtext; |
| 241 | - echo "<button type='submit' class='delete'>" . _("DO NOT SEND") . "</button>"; |
|
| 241 | + echo "<button type='submit' class='delete'>"._("DO NOT SEND")."</button>"; |
|
| 242 | 242 | echo "</form>"; |
| 243 | 243 | echo $formtext; |
| 244 | - echo "<input type='hidden' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'</>"; |
|
| 244 | + echo "<input type='hidden' name='command' value='".\web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'</>"; |
|
| 245 | 245 | echo "<input type='hidden' name='address' value='$properEmail'</>"; |
| 246 | - echo "<input type='hidden' name='token' value='" . $invitationObject->invitationTokenString . "'</>"; |
|
| 246 | + echo "<input type='hidden' name='token' value='".$invitationObject->invitationTokenString."'</>"; |
|
| 247 | 247 | echo "<input type='hidden' name='insecureconfirm' value='CONFIRM'/>"; |
| 248 | - echo "<button type='submit'>" . _("Send anyway.") . "</button>"; |
|
| 248 | + echo "<button type='submit'>"._("Send anyway.")."</button>"; |
|
| 249 | 249 | echo "</form>"; |
| 250 | 250 | echo $deco->footer(); |
| 251 | 251 | exit; |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | $activeUsers = $profile->listActiveUsers(); |
| 297 | 297 | |
| 298 | 298 | |
| 299 | -echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME )); |
|
| 299 | +echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME)); |
|
| 300 | 300 | |
| 301 | 301 | ?> |
| 302 | 302 | <script src='js/option_expand.js' type='text/javascript'></script> |
@@ -339,12 +339,12 @@ discard block |
||
| 339 | 339 | <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;'> |
| 340 | 340 | <?php echo $uiElements->instLevelInfoBoxes($inst); ?> |
| 341 | 341 | <div class='infobox'> |
| 342 | - <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption;?></h2> |
|
| 342 | + <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption; ?></h2> |
|
| 343 | 343 | <table> |
| 344 | - <caption><?php echo $tablecaption;?></caption> |
|
| 344 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 345 | 345 | <tr> |
| 346 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
| 347 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
| 346 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
| 347 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
| 348 | 348 | </tr> |
| 349 | 349 | |
| 350 | 350 | <tr> |
@@ -368,19 +368,19 @@ discard block |
||
| 368 | 368 | case "NOSTIPULATION": |
| 369 | 369 | break; |
| 370 | 370 | case "EMAIL-SENT": |
| 371 | - echo $boundaryPre . $uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE) . $boundaryPost; |
|
| 371 | + echo $boundaryPre.$uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE).$boundaryPost; |
|
| 372 | 372 | break; |
| 373 | 373 | case "EMAIL-NOTSENT": |
| 374 | - echo $boundaryPre . $uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE) . $boundaryPost; |
|
| 374 | + echo $boundaryPre.$uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE).$boundaryPost; |
|
| 375 | 375 | break; |
| 376 | 376 | case "SMS-SENT": |
| 377 | - echo $boundaryPre . $uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE) . $boundaryPost; |
|
| 377 | + echo $boundaryPre.$uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE).$boundaryPost; |
|
| 378 | 378 | break; |
| 379 | 379 | case "SMS-NOTSENT": |
| 380 | - echo $boundaryPre . $uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE) . $boundaryPost; |
|
| 380 | + echo $boundaryPre.$uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE).$boundaryPost; |
|
| 381 | 381 | break; |
| 382 | 382 | case "SMS-FRAGMENT": |
| 383 | - echo $boundaryPre . $uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE) . $boundaryPost; |
|
| 383 | + echo $boundaryPre.$uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE).$boundaryPost; |
|
| 384 | 384 | break; |
| 385 | 385 | } |
| 386 | 386 | ?> |
@@ -393,17 +393,17 @@ discard block |
||
| 393 | 393 | <?php |
| 394 | 394 | $bufferCurrentUsers = "<table class='sb-user-table' style='max-width:1920px;'> |
| 395 | 395 | <tr class='sb-title-row_id'> |
| 396 | - <td>" . _("User") . "</td> |
|
| 397 | - <td>" . _("Token/Certificate details") . "</td> |
|
| 398 | - <td>" . _("User/Token Expiry") . "</td> |
|
| 399 | - <td>" . _("Actions") . "</td> |
|
| 396 | + <td>" . _("User")."</td> |
|
| 397 | + <td>" . _("Token/Certificate details")."</td> |
|
| 398 | + <td>" . _("User/Token Expiry")."</td> |
|
| 399 | + <td>" . _("Actions")."</td> |
|
| 400 | 400 | </tr>"; |
| 401 | 401 | $bufferPreviousUsers = "<table class='sb-user-table' style='max-width:1920px;'> |
| 402 | 402 | <tr class='sb-title-row_id'> |
| 403 | - <td>" . _("User") . "</td> |
|
| 404 | - <td>" . _("Certificate details") . "</td> |
|
| 405 | - <td>" . _("User Expiry") . "</td> |
|
| 406 | - <td>" . _("Actions") . "</td> |
|
| 403 | + <td>" . _("User")."</td> |
|
| 404 | + <td>" . _("Certificate details")."</td> |
|
| 405 | + <td>" . _("User Expiry")."</td> |
|
| 406 | + <td>" . _("Actions")."</td> |
|
| 407 | 407 | </tr>"; |
| 408 | 408 | |
| 409 | 409 | natsort($allUsers); |
@@ -460,23 +460,23 @@ discard block |
||
| 460 | 460 | $display = empty(devices\Devices::listDevices()[$oneCert->device]['display']) ? $oneCert->device : devices\Devices::listDevices()[$oneCert->device]['display']; |
| 461 | 461 | |
| 462 | 462 | $bufferText = "<div class='sb-certificate-summary ca-summary' $style> |
| 463 | - <div class='sb-certificate-details'>" . _("Device:") . " " . $display . |
|
| 464 | - "<br>" . _("Serial Number:") . " " . dechex($oneCert->serial) . |
|
| 465 | - "<br>" . _("CN:") . " " . explode('@', $oneCert->username)[0] . "@…" . |
|
| 466 | - "<br>" . _("Expiry:") . " " . $oneCert->expiry . |
|
| 467 | - "<br>" . _("Issued:") . " " . $oneCert->issued . |
|
| 468 | - "</div>" . |
|
| 463 | + <div class='sb-certificate-details'>"._("Device:")." ".$display. |
|
| 464 | + "<br>"._("Serial Number:")." ".dechex($oneCert->serial). |
|
| 465 | + "<br>"._("CN:")." ".explode('@', $oneCert->username)[0]."@…". |
|
| 466 | + "<br>"._("Expiry:")." ".$oneCert->expiry. |
|
| 467 | + "<br>"._("Issued:")." ".$oneCert->issued. |
|
| 468 | + "</div>". |
|
| 469 | 469 | "<div style='text-align:right;padding-top: 5px; $buttonStyle'>"; |
| 470 | 470 | |
| 471 | 471 | if ($buttonText == "") { |
| 472 | 472 | $bufferText .= $formtext |
| 473 | - . "<input type='hidden' name='certSerial' value='" . $oneCert->serial . "'/>" |
|
| 474 | - . "<input type='hidden' name='certAlgo' value='" . $oneCert->ca_type . "'/>" |
|
| 473 | + . "<input type='hidden' name='certSerial' value='".$oneCert->serial."'/>" |
|
| 474 | + . "<input type='hidden' name='certAlgo' value='".$oneCert->ca_type."'/>" |
|
| 475 | 475 | . "<button type='submit' " |
| 476 | 476 | . "name='command' " |
| 477 | - . "value='" . \web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL . "' " |
|
| 477 | + . "value='".\web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL."' " |
|
| 478 | 478 | . "class='delete admin_only' " |
| 479 | - . "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']) . "\")'>" |
|
| 479 | + . "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'])."\")'>" |
|
| 480 | 480 | . _("Revoke") |
| 481 | 481 | . "</button>" |
| 482 | 482 | . "</form>"; |
@@ -501,13 +501,13 @@ discard block |
||
| 501 | 501 | } |
| 502 | 502 | // wrap the revoked and expired certs in a div that is hidden by default |
| 503 | 503 | if ($textRevokedCerts !== "") { |
| 504 | - $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>"; |
|
| 504 | + $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>"; |
|
| 505 | 505 | } |
| 506 | 506 | if ($textExpiredCerts !== "") { |
| 507 | - $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>"; |
|
| 507 | + $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>"; |
|
| 508 | 508 | } |
| 509 | 509 | // and push out the HTML |
| 510 | - ${$outputBuffer} .= $textActiveCerts . "<br/>" . $textExpiredCerts . " " . $textRevokedCerts . "</td>"; |
|
| 510 | + ${$outputBuffer} .= $textActiveCerts."<br/>".$textExpiredCerts." ".$textRevokedCerts."</td>"; |
|
| 511 | 511 | $tokenHtmlBuffer = ""; |
| 512 | 512 | $hasOnePendingInvite = FALSE; |
| 513 | 513 | foreach ($tokensWithoutCerts as $invitationObject) { |
@@ -518,38 +518,38 @@ discard block |
||
| 518 | 518 | $tokenHtmlBuffer .= "<tr class='sb-certificate-row_id admin_only'><td></td>"; |
| 519 | 519 | $jsEncodedBody = str_replace('\n', '%0D%0A', str_replace('"', '', json_encode($invitationObject->invitationMailBody()))); |
| 520 | 520 | $tokenHtmlBuffer .= "<td>"; |
| 521 | - $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/>"); |
|
| 521 | + $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/>"); |
|
| 522 | 522 | $tokenHtmlBuffer .= "<table> |
| 523 | - <tr><td style='vertical-align:bottom;'>" . _("E-Mail:") . "</td><td> |
|
| 523 | + <tr><td style='vertical-align:bottom;'>" . _("E-Mail:")."</td><td> |
|
| 524 | 524 | $formtext |
| 525 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 525 | + <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/> |
|
| 526 | 526 | <input type='text' name='address' id='address-$invitationObject->identifier'/> |
| 527 | - <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=" . $invitationObject->invitationMailSubject() . "&body=$jsEncodedBody\"; return false;'>" . _("Local mail client") . "</button> |
|
| 528 | - <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'>" . _("Send with CAT") . "</button> |
|
| 527 | + <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=".$invitationObject->invitationMailSubject()."&body=$jsEncodedBody\"; return false;'>"._("Local mail client")."</button> |
|
| 528 | + <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'>"._("Send with CAT")."</button> |
|
| 529 | 529 | </form> |
| 530 | 530 | </td></tr> |
| 531 | - <tr><td style='vertical-align:bottom;'>" . _("SMS:") . "</td><td> |
|
| 531 | + <tr><td style='vertical-align:bottom;'>" . _("SMS:")."</td><td> |
|
| 532 | 532 | $formtext |
| 533 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 533 | + <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/> |
|
| 534 | 534 | <input type='text' name='smsnumber' /> |
| 535 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS . "'>" . _("Send in SMS...") . "</button> |
|
| 535 | + <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS."'>"._("Send in SMS...")."</button> |
|
| 536 | 536 | </form> |
| 537 | 537 | </td></tr> |
| 538 | - <tr><td style='vertical-align:bottom;'>" . _("Manual:") . "</td><td> |
|
| 539 | - <button type='button' class='clipboardButton admin_only' onclick='clipboardCopy(" . $invitationObject->identifier . ");'>" . _("Copy to Clipboard") . "</button> |
|
| 538 | + <tr><td style='vertical-align:bottom;'>" . _("Manual:")."</td><td> |
|
| 539 | + <button type='button' class='clipboardButton admin_only' onclick='clipboardCopy(" . $invitationObject->identifier.");'>"._("Copy to Clipboard")."</button> |
|
| 540 | 540 | <form style='display:inline-block;' method='post' action='inc/displayQRcode.inc.php' onsubmit='popupQRWindow(this); return false;' accept-charset='UTF-8'> |
| 541 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 542 | - <button type='submit'>" . _("Display QR code") . "</button> |
|
| 541 | + <input type='hidden' value='" . $invitationObject->invitationTokenString."' name='token'><br/> |
|
| 542 | + <button type='submit'>" . _("Display QR code")."</button> |
|
| 543 | 543 | </form> |
| 544 | 544 | </td></tr> |
| 545 | 545 | |
| 546 | 546 | </table> |
| 547 | 547 | </td>"; |
| 548 | - $tokenHtmlBuffer .= "<td>" . _("Expiry Date:") . " " . $invitationObject->expiry . " UTC<br>" . _("Activations remaining:") . " " . sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal) . "</td>"; |
|
| 548 | + $tokenHtmlBuffer .= "<td>"._("Expiry Date:")." ".$invitationObject->expiry." UTC<br>"._("Activations remaining:")." ".sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal)."</td>"; |
|
| 549 | 549 | $tokenHtmlBuffer .= "<td>" |
| 550 | 550 | . $formtext |
| 551 | - . "<input type='hidden' name='invitationtoken' value='" . $invitationObject->invitationTokenString . "'/>" |
|
| 552 | - . "<button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_REVOKEINVITATION . "' class='delete'>" . _("Revoke") . "</button></form>" |
|
| 551 | + . "<input type='hidden' name='invitationtoken' value='".$invitationObject->invitationTokenString."'/>" |
|
| 552 | + . "<button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_REVOKEINVITATION."' class='delete'>"._("Revoke")."</button></form>" |
|
| 553 | 553 | . "</td></tr>"; |
| 554 | 554 | break; |
| 555 | 555 | case core\SilverbulletInvitation::SB_TOKENSTATUS_EXPIRED: |
@@ -565,10 +565,10 @@ discard block |
||
| 565 | 565 | } |
| 566 | 566 | ${$outputBuffer} .= "<td>$formtext |
| 567 | 567 | <div class='sb-date-container' style='min-width: 200px;'> |
| 568 | - <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='" . $profile->getUserExpiryDate($oneUserId) . "'> (UTC)</span> |
|
| 568 | + <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='".$profile->getUserExpiryDate($oneUserId)."'> (UTC)</span> |
|
| 569 | 569 | </div> |
| 570 | 570 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 571 | - <button type='submit' class='admin_only' name='command' value='" . \web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY . "'>" . _("Update") . "</button> |
|
| 571 | + <button type='submit' class='admin_only' name='command' value='".\web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY."'>"._("Update")."</button> |
|
| 572 | 572 | </form> |
| 573 | 573 | </td> |
| 574 | 574 | <td> |
@@ -576,33 +576,33 @@ discard block |
||
| 576 | 576 | |
| 577 | 577 | if ($hasOnePendingInvite || count($validCerts) > 0) { |
| 578 | 578 | $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']); |
| 579 | - ${$outputBuffer} .= $formtext . " |
|
| 579 | + ${$outputBuffer} .= $formtext." |
|
| 580 | 580 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 581 | 581 | <button type='submit' " |
| 582 | 582 | . "name='command' " |
| 583 | - . "value='" . \web\lib\common\FormElements::BUTTON_DEACTIVATEUSER . "' " |
|
| 583 | + . "value='".\web\lib\common\FormElements::BUTTON_DEACTIVATEUSER."' " |
|
| 584 | 584 | . "class='delete admin_only' " |
| 585 | - . ( count($validCerts) > 0 ? "onclick='return confirm(\"" . $deletionText . "\")' " : "" ) |
|
| 585 | + . (count($validCerts) > 0 ? "onclick='return confirm(\"".$deletionText."\")' " : "") |
|
| 586 | 586 | . ">" |
| 587 | 587 | . _("Deactivate User") |
| 588 | 588 | . "</button> |
| 589 | 589 | </form>"; |
| 590 | 590 | } |
| 591 | - ${$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'> |
|
| 592 | - <button type='submit'>" . _("Show Authentication Records") . "</button> |
|
| 591 | + ${$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'> |
|
| 592 | + <button type='submit'>"._("Show Authentication Records")."</button> |
|
| 593 | 593 | </form>"; |
| 594 | 594 | if (new DateTime() < new DateTime($expiryDate)) { // current user, allow sending new token |
| 595 | - ${$outputBuffer} .= $formtext . " |
|
| 595 | + ${$outputBuffer} .= $formtext." |
|
| 596 | 596 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 597 | - <button type='submit' name='command' class='admin_only' value='" . \web\lib\common\FormElements::BUTTON_NEWINVITATION . "'>" . _("New Invitation") . "</button> |
|
| 598 | - <label>" . _("Activations:") . " |
|
| 597 | + <button type='submit' name='command' class='admin_only' value='".\web\lib\common\FormElements::BUTTON_NEWINVITATION."'>"._("New Invitation")."</button> |
|
| 598 | + <label>" . _("Activations:")." |
|
| 599 | 599 | <input type='text' name='invitationsquantity' value='5' maxlength='3' style='width: 30px;'/> |
| 600 | 600 | </label> |
| 601 | 601 | </form>"; |
| 602 | 602 | } 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 |
| 603 | - ${$outputBuffer} .= $formtext . " |
|
| 603 | + ${$outputBuffer} .= $formtext." |
|
| 604 | 604 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 605 | - <button type='submit' class='delete admin_only' name='command' value='" . \web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete User") . "</button> |
|
| 605 | + <button type='submit' class='delete admin_only' name='command' value='".\web\lib\common\FormElements::BUTTON_DELETE."'>"._("Delete User")."</button> |
|
| 606 | 606 | </form>"; |
| 607 | 607 | } |
| 608 | 608 | ${$outputBuffer} .= "</div> |
@@ -634,13 +634,13 @@ discard block |
||
| 634 | 634 | . ' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".' |
| 635 | 635 | . ' 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); |
| 636 | 636 | |
| 637 | - echo $formtext . "<div style='padding-bottom: 20px;'>" |
|
| 637 | + echo $formtext."<div style='padding-bottom: 20px;'>" |
|
| 638 | 638 | . " |
| 639 | 639 | <p>$acknowledgeText</p> |
| 640 | 640 | <input type='checkbox' name='acknowledge' value='true'> |
| 641 | - <label>" . sprintf(_("I have verified that all configured users are still eligible for %s."),\config\ConfAssistant::CONSORTIUM['display_name']) . "</label> |
|
| 641 | + <label>".sprintf(_("I have verified that all configured users are still eligible for %s."), \config\ConfAssistant::CONSORTIUM['display_name'])."</label> |
|
| 642 | 642 | </div> |
| 643 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY . "'>" . _("Save") . "</button></form>"; |
|
| 643 | + <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY."'>"._("Save")."</button></form>"; |
|
| 644 | 644 | } |
| 645 | 645 | ?> |
| 646 | 646 | </div> |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | <?php |
| 98 | 98 | foreach ($cat->printCountryList(1) as $country => $name) { |
| 99 | 99 | $selected = ''; |
| 100 | - if ($country == strtoupper($fed_id) ) { |
|
| 100 | + if ($country == strtoupper($fed_id)) { |
|
| 101 | 101 | $selected = 'selected'; |
| 102 | 102 | } |
| 103 | 103 | echo "<option value='$country' $selected>$name</option>\n"; |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | /// nomenclature for 'federation', federation name, nomenclature for 'inst' |
| 316 | 316 | echo "<tr><td colspan='9'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>"; |
| 317 | 317 | echo "<tbody class='fedlist'>"; |
| 318 | - echo "<tr><td colspan='1'><strong>". _("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>"; |
|
| 318 | + echo "<tr><td colspan='1'><strong>"._("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>"; |
|
| 319 | 319 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='profilecheck' id='profile_ck_".$fedId."'></td>"; |
| 320 | 320 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='orcheck' id='or_ck_".$fedId."'></td>"; |
| 321 | 321 | echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='brokencert' id='brokencert_ck_".$fedId."'></td>"; |
@@ -428,14 +428,14 @@ discard block |
||
| 428 | 428 | <input type='hidden' name='inst' value='" |
| 429 | 429 | . $index."'>" |
| 430 | 430 | . "<span style='display:none' class='inst_name'>".$my_idp."</span>" |
| 431 | - . "<span>". $idp_instance->name."</span>" |
|
| 431 | + . "<span>".$idp_instance->name."</span>" |
|
| 432 | 432 | . " (<a href='overview_org.php?inst_id=" |
| 433 | 433 | . $idp_instance->identifier."'>" |
| 434 | 434 | . (in_array($index, $userIdps) ? _("manage") : _("view")) |
| 435 | 435 | . "</a>)" |
| 436 | - . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) |
|
| 436 | + . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>") |
|
| 437 | 437 | . implode("</li><li>", $listOfSilverbulletRealms) |
| 438 | - . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" ) |
|
| 438 | + . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>") |
|
| 439 | 439 | . "</td>"; |
| 440 | 440 | // deployment status; need to dive into profiles for this |
| 441 | 441 | // show happy eyeballs if at least one profile is configured/showtime |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | <div id="tabs-2"> |
| 151 | 151 | <!--<button id="run_s_tests" onclick="run_udp()"><?php echo _("Repeat static connectivity tests") ?></button>--> |
| 152 | 152 | <p> |
| 153 | - <?php print $realmTests->printStatic();?> |
|
| 153 | + <?php print $realmTests->printStatic(); ?> |
|
| 154 | 154 | |
| 155 | 155 | <!-- tabs-2 end --> |
| 156 | 156 | </div> |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | ?> |
| 161 | 161 | <div id="tabs-3"> |
| 162 | 162 | <!--<button id="run_d_tests" onclick="run_dynamic()"><?php echo _("Repeat dynamic connectivity tests") ?></button>--> |
| 163 | - <?php print $realmTests->printDynamic();?> |
|
| 163 | + <?php print $realmTests->printDynamic(); ?> |
|
| 164 | 164 | <!-- tabs-3 end --> |
| 165 | 165 | </div> |
| 166 | 166 | <?php |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * @param int $timeout the timeout to download |
| 40 | 40 | * @return string|boolean the data we got back, or FALSE on failure |
| 41 | 41 | */ |
| 42 | - public static function downloadFile($url, $timeout=0) |
|
| 42 | + public static function downloadFile($url, $timeout = 0) |
|
| 43 | 43 | { |
| 44 | 44 | $loggerInstance = new \core\common\Logging(); |
| 45 | 45 | if (!preg_match("/:\/\//", $url)) { |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no MX."); |
| 130 | 130 | return OutsideComm::MAILDOMAIN_NO_MX; |
| 131 | 131 | } |
| 132 | - $loggerInstance->debug(5, "Domain: $domain MX: " . /** @scrutinizer ignore-type */ print_r($mx, TRUE)); |
|
| 132 | + $loggerInstance->debug(5, "Domain: $domain MX: "./** @scrutinizer ignore-type */ print_r($mx, TRUE)); |
|
| 133 | 133 | // create a pool of A and AAAA records for all the MXes |
| 134 | 134 | $ipAddrs = []; |
| 135 | 135 | foreach ($mx as $onemx) { |
@@ -139,14 +139,14 @@ discard block |
||
| 139 | 139 | $ipAddrs[] = $oneipv4['ip']; |
| 140 | 140 | } |
| 141 | 141 | foreach ($v6list as $oneipv6) { |
| 142 | - $ipAddrs[] = "[" . $oneipv6['ipv6'] . "]"; |
|
| 142 | + $ipAddrs[] = "[".$oneipv6['ipv6']."]"; |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | if (count($ipAddrs) == 0) { |
| 146 | 146 | $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no mailserver hosts."); |
| 147 | 147 | return OutsideComm::MAILDOMAIN_NO_HOST; |
| 148 | 148 | } |
| 149 | - $loggerInstance->debug(5, "Domain: $domain Addrs: " . /** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE)); |
|
| 149 | + $loggerInstance->debug(5, "Domain: $domain Addrs: "./** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE)); |
|
| 150 | 150 | // connect to all hosts. If all can't connect, return MAILDOMAIN_NO_CONNECT. |
| 151 | 151 | // If at least one does not support STARTTLS or one of the hosts doesn't connect |
| 152 | 152 | // , return MAILDOMAIN_NO_STARTTLS (one which we can't connect to we also |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | switch (\config\ConfAssistant::SMSSETTINGS['provider']) { |
| 200 | 200 | case 'Nexmo': |
| 201 | 201 | // taken from https://docs.nexmo.com/messaging/sms-api |
| 202 | - $url = 'https://rest.nexmo.com/sms/json?' . http_build_query( |
|
| 202 | + $url = 'https://rest.nexmo.com/sms/json?'.http_build_query( |
|
| 203 | 203 | [ |
| 204 | 204 | 'api_key' => \config\ConfAssistant::SMSSETTINGS['username'], |
| 205 | 205 | 'api_secret' => \config\ConfAssistant::SMSSETTINGS['password'], |
@@ -230,14 +230,14 @@ discard block |
||
| 230 | 230 | $loggerInstance->debug(2, 'Problem with SMS invitation: no message was sent!'); |
| 231 | 231 | return OutsideComm::SMS_NOTSENT; |
| 232 | 232 | } |
| 233 | - $loggerInstance->debug(2, 'Total of ' . $messageCount . ' messages were attempted to send.'); |
|
| 233 | + $loggerInstance->debug(2, 'Total of '.$messageCount.' messages were attempted to send.'); |
|
| 234 | 234 | |
| 235 | 235 | $totalFailures = 0; |
| 236 | 236 | foreach ($decoded_response['messages'] as $message) { |
| 237 | 237 | if ($message['status'] == 0) { |
| 238 | - $loggerInstance->debug(2, $message['message-id'] . ": Success"); |
|
| 238 | + $loggerInstance->debug(2, $message['message-id'].": Success"); |
|
| 239 | 239 | } else { |
| 240 | - $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")"); |
|
| 240 | + $loggerInstance->debug(2, $message['message-id'].": Failed (failure code = ".$message['status'].")"); |
|
| 241 | 241 | $totalFailures++; |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | $proto = "https://"; |
| 307 | 307 | } |
| 308 | 308 | // then, send out the mail |
| 309 | - $message = _("Hello,") . "\n\n" . wordwrap($introTexts[$introtext] . " " . $validity, 72) . "\n\n"; |
|
| 309 | + $message = _("Hello,")."\n\n".wordwrap($introTexts[$introtext]." ".$validity, 72)."\n\n"; |
|
| 310 | 310 | // default means we don't have a Reply-To. |
| 311 | 311 | $replyToMessage = wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")); |
| 312 | 312 | |
@@ -314,8 +314,8 @@ discard block |
||
| 314 | 314 | // see if we are supposed to add a custom message |
| 315 | 315 | $customtext = $federation->getAttributes('fed:custominvite'); |
| 316 | 316 | if (count($customtext) > 0) { |
| 317 | - $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72) . "\n---------------------------------" . |
|
| 318 | - wordwrap($customtext[0]['value'], 72) . "\n---------------------------------\n\n"; |
|
| 317 | + $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72)."\n---------------------------------". |
|
| 318 | + wordwrap($customtext[0]['value'], 72)."\n---------------------------------\n\n"; |
|
| 319 | 319 | } |
| 320 | 320 | // and add Reply-To already now |
| 321 | 321 | foreach ($federation->listFederationAdmins() as $fedadmin_id) { |
@@ -331,19 +331,19 @@ discard block |
||
| 331 | 331 | } |
| 332 | 332 | $productname = \config\Master::APPEARANCE['productname']; |
| 333 | 333 | $consortium = \config\ConfAssistant::CONSORTIUM['display_name']; |
| 334 | - $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72) . "\n\n" . |
|
| 335 | - $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/action_enrollment.php?token=$newtoken\n\n" . |
|
| 336 | - wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72) . "\n\n" . |
|
| 337 | - $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/\n\n" . |
|
| 338 | - _("and enter the invitation token") . "\n\n" . |
|
| 339 | - $newtoken . "\n\n$replyToMessage\n\n" . |
|
| 340 | - wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "\n\n" . |
|
| 341 | - wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72) . "\n\n" . |
|
| 334 | + $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72)."\n\n". |
|
| 335 | + $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/action_enrollment.php?token=$newtoken\n\n". |
|
| 336 | + wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72)."\n\n". |
|
| 337 | + $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/\n\n". |
|
| 338 | + _("and enter the invitation token")."\n\n". |
|
| 339 | + $newtoken."\n\n$replyToMessage\n\n". |
|
| 340 | + wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72)."\n\n". |
|
| 341 | + wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72)."\n\n". |
|
| 342 | 342 | sprintf(_("Sincerely,\n\nYour friendly folks from %s Operations"), $consortium); |
| 343 | 343 | |
| 344 | 344 | |
| 345 | 345 | // who to whom? |
| 346 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System"; |
|
| 346 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System"; |
|
| 347 | 347 | |
| 348 | 348 | if (isset(\config\Master::APPEARANCE['invitation-bcc-mail']) && \config\Master::APPEARANCE['invitation-bcc-mail'] !== NULL) { |
| 349 | 349 | $mail->addBCC(\config\Master::APPEARANCE['invitation-bcc-mail']); |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | <table><tr> |
| 297 | 297 | <td class='icon_td'>"; |
| 298 | 298 | $out[] = "<img src='".$this->stateIcons[$this->globalLevelStatic]."' id='main_static_ico' class='icon'></td><td id='main_static_result'>". |
| 299 | - $this->globalInfo[$this->globalLevelStatic].' '. _("See the appropriate tab for details.").'</td> |
|
| 299 | + $this->globalInfo[$this->globalLevelStatic].' '._("See the appropriate tab for details.").'</td> |
|
| 300 | 300 | </tr></table>'; |
| 301 | 301 | if ($this->naptr > 0) { |
| 302 | 302 | $out[] = "<hr><strong>"._("Dynamic connectivity tests")."</strong> |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | <td class='icon_td'><img src='".$this->stateIcons[$result->level]."' id='src".$hostindex."_img'></td> |
| 329 | 329 | <td id='src$hostindex' colspan=2> |
| 330 | 330 | "; |
| 331 | - $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf (_("elapsed time: %sms."), $result->time_millisec).'<div>'.$result->message.'</div>'; |
|
| 331 | + $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf(_("elapsed time: %sms."), $result->time_millisec).'<div>'.$result->message.'</div>'; |
|
| 332 | 332 | |
| 333 | 333 | if ($result->level > \core\common\Entity::L_OK && property_exists($result, 'cert_oddities')) { |
| 334 | 334 | foreach ($result->cert_oddities as $oddities) { |
@@ -345,9 +345,9 @@ discard block |
||
| 345 | 345 | } |
| 346 | 346 | } |
| 347 | 347 | if ($result->server_cert->extensions) { |
| 348 | - $certdesc .= '<li>' . _('Extensions') . '<ul>'; |
|
| 348 | + $certdesc .= '<li>'._('Extensions').'<ul>'; |
|
| 349 | 349 | foreach ($result->server_cert->extensions as $ekey => $eval) { |
| 350 | - $certdesc .= '<li>' . $ekey . ': ' . $eval; |
|
| 350 | + $certdesc .= '<li>'.$ekey.': '.$eval; |
|
| 351 | 351 | } |
| 352 | 352 | $certdesc .= '</ul>'; |
| 353 | 353 | } |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | $more .= '<span class="morecontent"><span>'.$certdesc. |
| 356 | 356 | '</span><a href="" class="morelink">'._("show server certificate details").'»</a></span></div>'; |
| 357 | 357 | } |
| 358 | - if ($more != '' ) { |
|
| 358 | + if ($more != '') { |
|
| 359 | 359 | $out[] = '<tr><td> </td><td colspan="2">'.$more.'</td></tr>'; |
| 360 | 360 | } |
| 361 | 361 | $out[] = "</table></ul>"; |
@@ -379,10 +379,10 @@ discard block |
||
| 379 | 379 | if (isset($this->protocolsMap[$capath->IP]) && $this->protocolsMap[$capath->IP] != '') { |
| 380 | 380 | $prots = explode(';', $this->protocolsMap[$capath->IP]); |
| 381 | 381 | if (!empty($prots)) { |
| 382 | - $capathtest[] = ' ' . _("supported TLS protocols: "); |
|
| 382 | + $capathtest[] = ' '._("supported TLS protocols: "); |
|
| 383 | 383 | $capathtest[] = implode(', ', $prots); |
| 384 | 384 | if (!in_array("TLS1.3", $prots)) { |
| 385 | - $capathtest[] = ' ' . '<font color="red">' . _("not supported: ") . 'TLS1.3</font>'; |
|
| 385 | + $capathtest[] = ' '.'<font color="red">'._("not supported: ").'TLS1.3</font>'; |
|
| 386 | 386 | } |
| 387 | 387 | } |
| 388 | 388 | } |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | if ($capath->certdata->validTo) { |
| 406 | 406 | $certdesc .= '<li>'.$this->certFields['validTo'].' '. |
| 407 | 407 | date_create_from_format('ymdGis', |
| 408 | - substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s'). ' UTC'; |
|
| 408 | + substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s').' UTC'; |
|
| 409 | 409 | } |
| 410 | 410 | if ($capath->certdata->extensions) { |
| 411 | 411 | if ($capath->certdata->extensions->subjectaltname) { |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | } else { |
| 429 | 429 | $certdesc = '<br>'; |
| 430 | 430 | } |
| 431 | - $capathtest[] = '<div>'.($capath->message!='' ? $capath->message : _('Test failed')).'</div>'.$more; |
|
| 431 | + $capathtest[] = '<div>'.($capath->message != '' ? $capath->message : _('Test failed')).'</div>'.$more; |
|
| 432 | 432 | $capathtest[] = '</td> |
| 433 | 433 | </tr> |
| 434 | 434 | </table>'; |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | $srefused = 0; |
| 456 | 456 | $cliinfo = ''; |
| 457 | 457 | $cliinfo .= '<li>'._('Client certificate').' <b>'.$ca->clientcertinfo->from. |
| 458 | - '</b>'.', '.$ca->clientcertinfo->message . |
|
| 458 | + '</b>'.', '.$ca->clientcertinfo->message. |
|
| 459 | 459 | '<br> (CA: '.$ca->clientcertinfo->issuer.')<ul>'; |
| 460 | 460 | foreach ($ca->certificate as $certificate) { |
| 461 | 461 | if ($certificate->returncode == \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) { |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | } else { |
| 522 | 522 | $cliinfo = _('Test failed'); |
| 523 | 523 | $clientstest[] = "<table><tr><td class='icon_td' id='srcclient".$hostindex."_img'><img src='". |
| 524 | - $this->stateIcons[\core\common\Entity::L_WARN]."'></td>" . |
|
| 524 | + $this->stateIcons[\core\common\Entity::L_WARN]."'></td>". |
|
| 525 | 525 | "<td id='srcclient$hostindex'>$cliinfo</td></tr></table>"; |
| 526 | 526 | } |
| 527 | 527 | } else { |
@@ -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 | } |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = []; |
| 229 | 229 | } |
| 230 | 230 | // tls1_3 connections have a problem in strdout/stderr buffering |
| 231 | - $add .= ' ' . "-no_ssl3 -no_tls1_3"; |
|
| 231 | + $add .= ' '."-no_ssl3 -no_tls1_3"; |
|
| 232 | 232 | $opensslbabble = $this->execOpensslClient($host, $add, $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]); |
| 233 | 233 | $res = $this->opensslClientsResult($host, $opensslbabble, $this->TLS_clients_checks_result, $type, $k); |
| 234 | 234 | if ($cert['expected'] == 'PASS') { |
@@ -270,11 +270,11 @@ discard block |
||
| 270 | 270 | // but code analysers want this more explicit, so here is this extra |
| 271 | 271 | // call to escapeshellarg() |
| 272 | 272 | $escapedHost = escapeshellarg($host); |
| 273 | - $this->loggerInstance->debug(4, \config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1\n"); |
|
| 273 | + $this->loggerInstance->debug(4, \config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1\n"); |
|
| 274 | 274 | $time_start = microtime(true); |
| 275 | 275 | $opensslbabble = []; |
| 276 | 276 | $result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures |
| 277 | - exec(\config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result); |
|
| 277 | + exec(\config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result); |
|
| 278 | 278 | $time_stop = microtime(true); |
| 279 | 279 | $testresults['time_millisec'] = floor(($time_stop - $time_start) * 1000); |
| 280 | 280 | $testresults['returncode'] = $result; |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | private function propertyCheckPolicy($cert) |
| 397 | 397 | { |
| 398 | 398 | $oids = []; |
| 399 | - if (isset($cert['extensions']['certificatePolicies']) && $cert['extensions']['certificatePolicies']) { |
|
| 399 | + if (isset($cert['extensions']['certificatePolicies']) && $cert['extensions']['certificatePolicies']) { |
|
| 400 | 400 | foreach (\config\Diagnostics::RADIUSTESTS['TLS-acceptableOIDs'] as $key => $oid) { |
| 401 | 401 | if (preg_match("/Policy: $oid/", $cert['extensions']['certificatePolicies'])) { |
| 402 | 402 | $oids[$key] = $oid; |
@@ -125,6 +125,6 @@ |
||
| 125 | 125 | ]; |
| 126 | 126 | const TIMEOUTS = [ |
| 127 | 127 | 'ajax_radius_tests' => 15000, // miliseconds |
| 128 | - 'crl_download' => 10, // seconds |
|
| 128 | + 'crl_download' => 10, // seconds |
|
| 129 | 129 | ]; |
| 130 | 130 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
| 22 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
| 23 | 23 | |
| 24 | 24 | $loggerInstance = new \core\common\Logging(); |
| 25 | 25 | |
@@ -69,13 +69,13 @@ discard block |
||
| 69 | 69 | $dnsChecksOR = new \core\diag\RFC7585Tests($check_realm, "aaa+auth:radius.tls.tcp"); |
| 70 | 70 | } |
| 71 | 71 | } else { |
| 72 | - $error_message = _("You asked for a realm check, but we don't know the realm for this profile!") . "</p>"; |
|
| 72 | + $error_message = _("You asked for a realm check, but we don't know the realm for this profile!")."</p>"; |
|
| 73 | 73 | } |
| 74 | 74 | } else { // someone else's realm, and we don't know anything about it... only shallow checks |
| 75 | 75 | $check_realm = $validator->realm($realm ?? $_SESSION['check_realm'] ?? ""); |
| 76 | 76 | if ($check_realm !== FALSE) { |
| 77 | 77 | $_SESSION['check_realm'] = $check_realm; |
| 78 | - $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm); |
|
| 78 | + $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm); |
|
| 79 | 79 | $dnsChecks = new \core\diag\RFC7585Tests($check_realm); |
| 80 | 80 | } else { |
| 81 | 81 | $error_message = _("No valid realm name given, cannot execute any checks!"); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | var listofcas = "<?php echo _("You should update your list of accredited CAs") ?>"; |
| 123 | 123 | var getitfrom = "<?php echo _("Get it from here.") ?>"; |
| 124 | 124 | var listsource = "<?php echo \config\Diagnostics::RADIUSTESTS['accreditedCAsURL'] ?>"; |
| 125 | - var moretext = "<?php echo _("more") . "»" ?>"; |
|
| 125 | + var moretext = "<?php echo _("more")."»" ?>"; |
|
| 126 | 126 | var lesstext = "<?php echo "«" ?>"; |
| 127 | 127 | var morealltext = "<?php echo _("Show detailed information for all tests") ?>"; |
| 128 | 128 | var eof_error = "<?php echo \core\diag\RADIUSTests::CERTPROB_UNEXPECTED_EOF ?>"; |
@@ -273,10 +273,10 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | cliinfo = cliinfo + '<li>'; |
| 275 | 275 | if (data.ca[key].certificate[c].finalerror && data.ca[key].certificate[c].finalerror==2) { |
| 276 | - cliinfo = cliinfo + ' <?php echo _("this test was skipped - no appropriate client certificate");?>' + '</ul></li>'; |
|
| 276 | + cliinfo = cliinfo + ' <?php echo _("this test was skipped - no appropriate client certificate"); ?>' + '</ul></li>'; |
|
| 277 | 277 | } else { |
| 278 | 278 | cliinfo = cliinfo + '<table><tbody><tr><td class="icon_td"><img class="icon" src="' + icons[level] + '" style="width: 24px;"></td><td>' + state; |
| 279 | - cliinfo = cliinfo + ' <?php echo "(" . sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+' ") . ")"; ?>' + add + '</td></tr>'; |
|
| 279 | + cliinfo = cliinfo + ' <?php echo "(".sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+' ").")"; ?>' + add + '</td></tr>'; |
|
| 280 | 280 | cliinfo = cliinfo + '</tbody></table></ul></li>'; |
| 281 | 281 | } |
| 282 | 282 | |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | }); |
| 476 | 476 | } |
| 477 | 477 | o = o + cert_data + '</table>'; |
| 478 | - $("#eap_test" + data.hostindex).append('<strong><img style="position: relative; top: 2px;" src="' + icons[v.level] + '"><span style="position: relative; top: -5px; <?php echo $start;?>: 1em">' + v.eap + ' – <?php printf(_("elapsed time: %sms."), "'+v.time_millisec+' ") ?></span></strong><div class="more" style="padding-<?php echo $start;?>: 40px"><div class="morecontent"><div style="display:none; background: #eee;">' + o + '</div><a href="" class="morelink">' + moretext + '</a></div></div>'); |
|
| 478 | + $("#eap_test" + data.hostindex).append('<strong><img style="position: relative; top: 2px;" src="' + icons[v.level] + '"><span style="position: relative; top: -5px; <?php echo $start; ?>: 1em">' + v.eap + ' – <?php printf(_("elapsed time: %sms."), "'+v.time_millisec+' ") ?></span></strong><div class="more" style="padding-<?php echo $start; ?>: 40px"><div class="morecontent"><div style="display:none; background: #eee;">' + o + '</div><a href="" class="morelink">' + moretext + '</a></div></div>'); |
|
| 479 | 479 | }); |
| 480 | 480 | } |
| 481 | 481 | |
@@ -486,8 +486,8 @@ discard block |
||
| 486 | 486 | <?php |
| 487 | 487 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 488 | 488 | print " |
| 489 | -$(\"#live_src" . $hostindex . "_img\").attr('src',icon_loading); |
|
| 490 | -$(\"#live_src" . $hostindex . "_img\").show(); |
|
| 489 | +$(\"#live_src" . $hostindex."_img\").attr('src',icon_loading); |
|
| 490 | +$(\"#live_src" . $hostindex."_img\").show(); |
|
| 491 | 491 | $.ajax({ |
| 492 | 492 | url: 'radius_tests.php?src=0&hostindex=$hostindex&realm='+realm, |
| 493 | 493 | type: 'POST', |
@@ -520,15 +520,15 @@ discard block |
||
| 520 | 520 | <?php |
| 521 | 521 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 522 | 522 | if ($testedProfile !== NULL) { |
| 523 | - $extraarg = "profile_id: " . $testedProfile->identifier . ", "; |
|
| 523 | + $extraarg = "profile_id: ".$testedProfile->identifier.", "; |
|
| 524 | 524 | } else { |
| 525 | 525 | $extraarg = ""; |
| 526 | 526 | } |
| 527 | 527 | print " |
| 528 | -$(\"#src" . $hostindex . "_img\").attr('src',icon_loading); |
|
| 528 | +$(\"#src" . $hostindex."_img\").attr('src',icon_loading); |
|
| 529 | 529 | $(\"#src$hostindex\").html(''); |
| 530 | 530 | running_ajax_stat++; |
| 531 | -$.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex'}, hostindex: '$hostindex', error: error_handler, success: udp, dataType: 'json'}); |
|
| 531 | +$.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex'}, hostindex: '$hostindex', error: error_handler, success: udp, dataType: 'json'}); |
|
| 532 | 532 | "; |
| 533 | 533 | } |
| 534 | 534 | |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | if ($check_realm === FALSE) { |
| 587 | 587 | print "<p>$error_message</p>"; |
| 588 | 588 | } else { |
| 589 | - print "<h1>" . sprintf(_("Realm testing for: %s"), $check_realm) . "</h1>\n"; |
|
| 589 | + print "<h1>".sprintf(_("Realm testing for: %s"), $check_realm)."</h1>\n"; |
|
| 590 | 590 | ?> |
| 591 | 591 | <div id="debug_out" style="display: none"></div> |
| 592 | 592 | <div id="tabs" style="min-width: 600px; max-width:1000px"> |
@@ -608,25 +608,25 @@ discard block |
||
| 608 | 608 | // NAPTR existence check |
| 609 | 609 | if ($dynType == "") { |
| 610 | 610 | $rfc7585suite = $dnsChecks; |
| 611 | - echo "<strong>" . _("DNS checks") . "</strong><div>"; |
|
| 611 | + echo "<strong>"._("DNS checks")."</strong><div>"; |
|
| 612 | 612 | } else { |
| 613 | 613 | if (count($orrealm) == 0) { |
| 614 | 614 | continue; |
| 615 | 615 | } |
| 616 | 616 | $rfc7585suite = $dnsChecksOR; |
| 617 | - echo "<strong>" . _("OpenRoaming DNS checks") . "</strong><div>"; |
|
| 617 | + echo "<strong>"._("OpenRoaming DNS checks")."</strong><div>"; |
|
| 618 | 618 | } |
| 619 | 619 | $naptr = $rfc7585suite->relevantNAPTR(); |
| 620 | 620 | if ($naptr == \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) { |
| 621 | 621 | if ($dynType == "") { |
| 622 | - echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>"; |
|
| 622 | + echo "<tr><td>"._("Dynamic discovery test is not configured")."</td><td>"; |
|
| 623 | 623 | } else { |
| 624 | - echo "<tr><td>" . _("OpenRoaming connectivity test is not configured") . "</td><td>"; |
|
| 624 | + echo "<tr><td>"._("OpenRoaming connectivity test is not configured")."</td><td>"; |
|
| 625 | 625 | } |
| 626 | 626 | } else { |
| 627 | 627 | echo "<table>"; |
| 628 | 628 | // output in friendly words |
| 629 | - echo "<tr><td>" . _("Checking NAPTR existence:") . "</td><td>"; |
|
| 629 | + echo "<tr><td>"._("Checking NAPTR existence:")."</td><td>"; |
|
| 630 | 630 | switch ($naptr) { |
| 631 | 631 | case \core\diag\RFC7585Tests::RETVAL_NONAPTR: |
| 632 | 632 | echo _("This realm has no NAPTR records."); |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | |
| 642 | 642 | // compliance checks for NAPTRs |
| 643 | 643 | if ($naptr > 0) { |
| 644 | - echo "<tr><td>" . _("Checking NAPTR compliance (flag = S and regex = {empty}):") . "</td><td>"; |
|
| 644 | + echo "<tr><td>"._("Checking NAPTR compliance (flag = S and regex = {empty}):")."</td><td>"; |
|
| 645 | 645 | $naptr_valid = $rfc7585suite->relevantNAPTRcompliance(); |
| 646 | 646 | switch ($naptr_valid) { |
| 647 | 647 | case \core\diag\RADIUSTests::RETVAL_OK: |
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | // SRV resolution |
| 657 | 657 | if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK) { |
| 658 | 658 | $srv = $rfc7585suite->relevantNAPTRsrvResolution(); |
| 659 | - echo "<tr><td>" . _("Checking SRVs:") . "</td><td>"; |
|
| 659 | + echo "<tr><td>"._("Checking SRVs:")."</td><td>"; |
|
| 660 | 660 | switch ($srv) { |
| 661 | 661 | case \core\diag\RADIUSTests::RETVAL_SKIPPED: |
| 662 | 662 | echo _("This check was skipped."); |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | // IP addresses for the hosts |
| 673 | 673 | if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK && $srv > 0) { |
| 674 | 674 | $hosts = $rfc7585suite->relevantNAPTRhostnameResolution(); |
| 675 | - echo "<tr><td>" . _("Checking IP address resolution:") . "</td><td>"; |
|
| 675 | + echo "<tr><td>"._("Checking IP address resolution:")."</td><td>"; |
|
| 676 | 676 | switch ($srv) { |
| 677 | 677 | case \core\diag\RADIUSTests::RETVAL_SKIPPED: |
| 678 | 678 | echo _("This check was skipped."); |
@@ -689,12 +689,12 @@ discard block |
||
| 689 | 689 | echo "</table><br/>"; |
| 690 | 690 | if ($dynType == "") { |
| 691 | 691 | if (count($testsuite->listerrors()) == 0) { |
| 692 | - echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("with no DNS errors encountered. Congratulations!"); |
|
| 692 | + echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("with no DNS errors encountered. Congratulations!"); |
|
| 693 | 693 | } else { |
| 694 | - echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("but there were DNS errors! Check them!") . " " . _("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below."); |
|
| 694 | + echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("but there were DNS errors! Check them!")." "._("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below."); |
|
| 695 | 695 | echo "<div class='notacceptable'><table>"; |
| 696 | 696 | foreach ($testsuite->listerrors() as $details) { |
| 697 | - echo "<tr><td>" . $details['TYPE'] . "</td><td>" . $details['TARGET'] . "</td></tr>"; |
|
| 697 | + echo "<tr><td>".$details['TYPE']."</td><td>".$details['TARGET']."</td></tr>"; |
|
| 698 | 698 | } |
| 699 | 699 | echo "</table></div>"; |
| 700 | 700 | } |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | $("#dynamic_tests").show(); |
| 714 | 714 | '; |
| 715 | 715 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 716 | - $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port']; |
|
| 716 | + $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port']; |
|
| 717 | 717 | $expectedName = $addr['hostname']; |
| 718 | 718 | $ssltest = 1; |
| 719 | 719 | if (isset($addr['unavailable']) && $addr['unavailable']) { |
@@ -722,9 +722,9 @@ discard block |
||
| 722 | 722 | //$rfc6614suite = new \core\diag\RFC6614Tests([$host], $expectedName, $consortiumName); |
| 723 | 723 | print " |
| 724 | 724 | running_ajax_dyn++; |
| 725 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'capath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: capath, dataType: 'json'}); |
|
| 725 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'capath', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: capath, dataType: 'json'}); |
|
| 726 | 726 | running_ajax_dyn++; |
| 727 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'clients', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: clients, dataType: 'json'}); |
|
| 727 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'clients', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', ssltest: $ssltest }, hostindex: '$hostindex', error: error_handler, success: clients, dataType: 'json'}); |
|
| 728 | 728 | "; |
| 729 | 729 | } |
| 730 | 730 | echo "} |
@@ -740,11 +740,11 @@ discard block |
||
| 740 | 740 | $("#openroaming_tests").show(); |
| 741 | 741 | '; |
| 742 | 742 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 743 | - $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port']; |
|
| 743 | + $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port']; |
|
| 744 | 744 | $expectedName = $addr['hostname']; |
| 745 | 745 | print " |
| 746 | 746 | running_ajax_openroaming++; |
| 747 | - $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'openroamingcapath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest, protocols: '$protstr' }, hostindex: '$hostindex', openroaming: true, error: error_handler, success: capath, dataType: 'json'}); |
|
| 747 | + $.ajax({url:'radius_tests.php', timeout: ajax_timeout, data:{test_type: 'openroamingcapath', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex', expectedname: '$expectedName', ssltest: $ssltest, protocols: '$protstr' }, hostindex: '$hostindex', openroaming: true, error: error_handler, success: capath, dataType: 'json'}); |
|
| 748 | 748 | "; |
| 749 | 749 | } |
| 750 | 750 | echo "} |
@@ -757,18 +757,18 @@ discard block |
||
| 757 | 757 | $naptrs[1] = $naptr; |
| 758 | 758 | } |
| 759 | 759 | } |
| 760 | - echo "<strong>" . _("Static connectivity tests") . "</strong> |
|
| 760 | + echo "<strong>"._("Static connectivity tests")."</strong> |
|
| 761 | 761 | <table><tr> |
| 762 | 762 | <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_static_ico' class='icon'></td><td id='main_static_result' style='display:none'> </td> |
| 763 | 763 | </tr></table>"; |
| 764 | 764 | if ($naptrs[0] > 0) { |
| 765 | - echo "<hr><strong>" . _("Dynamic connectivity tests") . "</strong> |
|
| 765 | + echo "<hr><strong>"._("Dynamic connectivity tests")."</strong> |
|
| 766 | 766 | <table><tr> |
| 767 | 767 | <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_dynamic_ico' class='icon'></td><td id='main_dynamic_result' style='display:none'> </td> |
| 768 | 768 | </tr></table>"; |
| 769 | 769 | } |
| 770 | 770 | if (isset($orrealm) && count($orrealm) && ($naptrs[1] > 0)) { |
| 771 | - echo "<hr><strong>" . _("OpenRoaming connectivity tests") . "</strong> |
|
| 771 | + echo "<hr><strong>"._("OpenRoaming connectivity tests")."</strong> |
|
| 772 | 772 | <table><tr> |
| 773 | 773 | <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_openroaming_ico' class='icon'></td><td id='main_openroaming_result' style='display:none'> </td> |
| 774 | 774 | </tr></table>"; |
@@ -788,12 +788,12 @@ discard block |
||
| 788 | 788 | print "<p>"; |
| 789 | 789 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 790 | 790 | print "<hr>"; |
| 791 | - printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>"); |
|
| 791 | + printf(_("Testing from: %s"), "<strong>".\config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>"); |
|
| 792 | 792 | print "<table id='results$hostindex' style='width:100%' class='udp_results'> |
| 793 | 793 | <tr> |
| 794 | -<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src" . $hostindex . "_img'></td> |
|
| 794 | +<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src".$hostindex."_img'></td> |
|
| 795 | 795 | <td id='src$hostindex' colspan=2> |
| 796 | -" . _("testing...") . " |
|
| 796 | +"._("testing...")." |
|
| 797 | 797 | </td> |
| 798 | 798 | </tr> |
| 799 | 799 | </table>"; |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | |
| 805 | 805 | </div> |
| 806 | 806 | <?php |
| 807 | - for ($i=3; $i<5; $i++) { |
|
| 807 | + for ($i = 3; $i < 5; $i++) { |
|
| 808 | 808 | if ($i == 3 && $naptrs[0] <= 0) { |
| 809 | 809 | continue; |
| 810 | 810 | } |
@@ -819,15 +819,15 @@ discard block |
||
| 819 | 819 | $rfc7585suite = $dnsChecksOR; |
| 820 | 820 | } |
| 821 | 821 | ?> |
| 822 | - <div id="tabs-<?php echo $i;?>"> |
|
| 823 | - <button id="run_<?php if ($i==3) echo 'd'; else echo 'o';?>_tests"; onclick="run_<?php if ($i==3) echo 'dynamic'; else echo 'openroaming';?>()"><?php if ($i==3) echo _("Repeat dynamic connectivity tests"); else echo _("Repeat OpenRoaming connectivity tests");?></button> |
|
| 822 | + <div id="tabs-<?php echo $i; ?>"> |
|
| 823 | + <button id="run_<?php if ($i == 3) echo 'd'; else echo 'o'; ?>_tests"; onclick="run_<?php if ($i == 3) echo 'dynamic'; else echo 'openroaming'; ?>()"><?php if ($i == 3) echo _("Repeat dynamic connectivity tests"); else echo _("Repeat OpenRoaming connectivity tests"); ?></button> |
|
| 824 | 824 | |
| 825 | 825 | <?php |
| 826 | 826 | echo "<div id='"; |
| 827 | - if ($i==3) { echo 'dynamic'; } else { echo 'openroaming'; } |
|
| 827 | + if ($i == 3) { echo 'dynamic'; } else { echo 'openroaming'; } |
|
| 828 | 828 | echo "_tests'><fieldset class='option_container'> |
| 829 | 829 | <legend><strong>"; |
| 830 | - if ($i==3) { |
|
| 830 | + if ($i == 3) { |
|
| 831 | 831 | echo _("DYNAMIC connectivity tests"); |
| 832 | 832 | } else { |
| 833 | 833 | echo _("OpenRoaming connectivity tests"); |
@@ -841,11 +841,11 @@ discard block |
||
| 841 | 841 | } |
| 842 | 842 | $resultstoprint = []; |
| 843 | 843 | if (count($rfc7585suite->NAPTR_hostname_records) > 0) { |
| 844 | - $resultstoprint[] = '<div style="align:'.$end.'; display: none;" id="' . $prefix1 . '_result_fail">' . _("Some errors were found during the tests, see below") . '</div><div style="align:'.$end.'; display: none;" id="' . $prefix1 . '_result_pass">' . _("All tests passed, congratulations!") . '</div>'; |
|
| 845 | - $resultstoprint[] = '<div style="align:'.$end.';"><a href="" class="moreall">' . _('Show detailed information for all tests') . '</a></div>' . '<p><strong>' . _("Checking server handshake...") . "</strong><p>"; |
|
| 844 | + $resultstoprint[] = '<div style="align:'.$end.'; display: none;" id="'.$prefix1.'_result_fail">'._("Some errors were found during the tests, see below").'</div><div style="align:'.$end.'; display: none;" id="'.$prefix1.'_result_pass">'._("All tests passed, congratulations!").'</div>'; |
|
| 845 | + $resultstoprint[] = '<div style="align:'.$end.';"><a href="" class="moreall">'._('Show detailed information for all tests').'</a></div>'.'<p><strong>'._("Checking server handshake...")."</strong><p>"; |
|
| 846 | 846 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 847 | - $bracketaddr = ($addr["family"] == "IPv6" ? "[" . $addr["IP"] . "]" : $addr["IP"]); |
|
| 848 | - $resultstoprint[] = '<p><strong>' . $bracketaddr . ' TCP/' . $addr['port'] . '</strong> (' . $addr['hostname'] . ')'; |
|
| 847 | + $bracketaddr = ($addr["family"] == "IPv6" ? "[".$addr["IP"]."]" : $addr["IP"]); |
|
| 848 | + $resultstoprint[] = '<p><strong>'.$bracketaddr.' TCP/'.$addr['port'].'</strong> ('.$addr['hostname'].')'; |
|
| 849 | 849 | $prots = []; |
| 850 | 850 | if (isset($addr['protocols'])) { |
| 851 | 851 | foreach ($addr['protocols'] as $protocol) { |
@@ -855,18 +855,18 @@ discard block |
||
| 855 | 855 | } |
| 856 | 856 | } |
| 857 | 857 | if (!empty($prots)) { |
| 858 | - $resultstoprint[] = ' ' . _("supported TLS protocols: "); |
|
| 858 | + $resultstoprint[] = ' '._("supported TLS protocols: "); |
|
| 859 | 859 | $resultstoprint[] = implode(', ', $prots); |
| 860 | 860 | if (!isset($addr['istls13']) || !$addr['istls13']) { |
| 861 | - $resultstoprint[] = ' ' . '<font color="red">' . _("not supported: ") . 'TLS1.3</font>'; |
|
| 861 | + $resultstoprint[] = ' '.'<font color="red">'._("not supported: ").'TLS1.3</font>'; |
|
| 862 | 862 | } |
| 863 | 863 | } |
| 864 | 864 | $resultstoprint[] = '<ul style="list-style-type: none;" class="caresult"><li>'; |
| 865 | - $resultstoprint[] = "<table id='" . $prefix2 . "caresults$hostindex' style='width:100%'> |
|
| 865 | + $resultstoprint[] = "<table id='".$prefix2."caresults$hostindex' style='width:100%'> |
|
| 866 | 866 | <tr> |
| 867 | -<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='" . $prefix2 . "srcca$hostindex" . "_img'></td> |
|
| 868 | -<td id='" . $prefix2 . "srcca$hostindex'> |
|
| 869 | -" . _("testing...") . " |
|
| 867 | +<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='".$prefix2."srcca$hostindex"."_img'></td> |
|
| 868 | +<td id='" . $prefix2."srcca$hostindex'> |
|
| 869 | +"._("testing...")." |
|
| 870 | 870 | </td> |
| 871 | 871 | </tr> |
| 872 | 872 | </table>"; |
@@ -874,26 +874,26 @@ discard block |
||
| 874 | 874 | } |
| 875 | 875 | $clientstest = []; |
| 876 | 876 | foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) { |
| 877 | - $clientstest[] = '<p><strong>' . $addr['IP'] . ' TCP/' . $addr['port'] . '</strong></p><ol>'; |
|
| 878 | - $clientstest[] = "<span id='" . $prefix2 . "clientresults$hostindex'><table style='width:100%'> |
|
| 877 | + $clientstest[] = '<p><strong>'.$addr['IP'].' TCP/'.$addr['port'].'</strong></p><ol>'; |
|
| 878 | + $clientstest[] = "<span id='".$prefix2."clientresults$hostindex'><table style='width:100%'> |
|
| 879 | 879 | <tr> |
| 880 | 880 | <td class='icon_td'>"; |
| 881 | - if ($i == 4 ) { |
|
| 881 | + if ($i == 4) { |
|
| 882 | 882 | $clientstest[] = "<!--"; |
| 883 | 883 | } |
| 884 | - $clientstest[] = "<img src='../resources/images/icons/loading51.gif' id='" . $prefix2 . "srcclient$hostindex" . "_img'></td> |
|
| 885 | -<td id='" . $prefix2 . "srcclient$hostindex'> |
|
| 886 | -" . _("testing..."); |
|
| 884 | + $clientstest[] = "<img src='../resources/images/icons/loading51.gif' id='".$prefix2."srcclient$hostindex"."_img'></td> |
|
| 885 | +<td id='" . $prefix2."srcclient$hostindex'> |
|
| 886 | +"._("testing..."); |
|
| 887 | 887 | |
| 888 | - if ($i == 4 ) { |
|
| 889 | - $clientstest[] = "-->" . _("not implemented yet"); |
|
| 888 | + if ($i == 4) { |
|
| 889 | + $clientstest[] = "-->"._("not implemented yet"); |
|
| 890 | 890 | } |
| 891 | 891 | $clientstest[] = "</td></tr></table></span>"; |
| 892 | 892 | $clientstest[] = '</ol>'; |
| 893 | 893 | } |
| 894 | 894 | echo '<div style="align:'.$end.';">'; |
| 895 | 895 | echo join('', $resultstoprint); |
| 896 | - echo '<span id="' . $prefix2 . 'clientstest" style="display: none;"><p><hr><b>' . _('Checking if certificates from CAs are accepted...') . '</b><p>' . _('A few client certificates will be tested to check if servers are resistant to some certificate problems.') . '<p>'; |
|
| 896 | + echo '<span id="'.$prefix2.'clientstest" style="display: none;"><p><hr><b>'._('Checking if certificates from CAs are accepted...').'</b><p>'._('A few client certificates will be tested to check if servers are resistant to some certificate problems.').'<p>'; |
|
| 897 | 897 | print join('', $clientstest); |
| 898 | 898 | echo '</span>'; |
| 899 | 899 | echo '</div>'; |
@@ -907,7 +907,7 @@ discard block |
||
| 907 | 907 | // check if truncates/dies on Operator-Name |
| 908 | 908 | if ($my_profile !== NULL) { |
| 909 | 909 | echo "<div id='tabs-n'><fieldset class='option_container'> |
| 910 | - <legend><strong>" . _("Live login test") . "</strong></legend>"; |
|
| 910 | + <legend><strong>" . _("Live login test")."</strong></legend>"; |
|
| 911 | 911 | $prof_compl = $my_profile->getEapMethodsinOrderOfPreference(1); |
| 912 | 912 | if (count($prof_compl) > 0) { |
| 913 | 913 | $passwordReqired = FALSE; |
@@ -920,34 +920,34 @@ discard block |
||
| 920 | 920 | $clientCertRequired = TRUE; |
| 921 | 921 | } |
| 922 | 922 | } |
| 923 | - echo "<div id='disposable_credential_container'><p>" . _("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.") . "</p> |
|
| 924 | - <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.") . "</p> |
|
| 925 | - <p>" . _("Note: the tool purposefully does not offer you to save these credentials, and they will never be saved in any way on the server side. Please use only <strong>temporary test accounts</strong> here; permanently valid test accounts in the wild are considered harmful!") . "</p></div> |
|
| 923 | + echo "<div id='disposable_credential_container'><p>"._("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.")."</p> |
|
| 924 | + <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.")."</p> |
|
| 925 | + <p>" . _("Note: the tool purposefully does not offer you to save these credentials, and they will never be saved in any way on the server side. Please use only <strong>temporary test accounts</strong> here; permanently valid test accounts in the wild are considered harmful!")."</p></div> |
|
| 926 | 926 | <form enctype='multipart/form-data' id='live_form' accept-charset='UTF-8'> |
| 927 | 927 | <input type='hidden' name='test_type' value='udp_login'> |
| 928 | - <input type='hidden' name='lang' value='" . $gui->languageInstance->getLang() . "'> |
|
| 929 | - <input type='hidden' name='profile_id' value='" . $my_profile->identifier . "'> |
|
| 928 | + <input type='hidden' name='lang' value='" . $gui->languageInstance->getLang()."'> |
|
| 929 | + <input type='hidden' name='profile_id' value='" . $my_profile->identifier."'> |
|
| 930 | 930 | <table id='live_tests'>"; |
| 931 | 931 | // if any password based EAP methods are available enable this section |
| 932 | 932 | if ($passwordReqired) { |
| 933 | - echo "<tr><td colspan='2'><strong>" . _("Password-based EAP types") . "</strong></td></tr> |
|
| 934 | - <tr><td>" . _("Real (inner) username:") . "</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>"; |
|
| 935 | - echo "<tr><td>" . _("Anonymous outer ID (optional):") . "</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>"; |
|
| 936 | - echo "<tr><td>" . _("Password:") . "</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>"; |
|
| 933 | + echo "<tr><td colspan='2'><strong>"._("Password-based EAP types")."</strong></td></tr> |
|
| 934 | + <tr><td>" . _("Real (inner) username:")."</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>"; |
|
| 935 | + echo "<tr><td>"._("Anonymous outer ID (optional):")."</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>"; |
|
| 936 | + echo "<tr><td>"._("Password:")."</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>"; |
|
| 937 | 937 | } |
| 938 | 938 | // ask for cert + privkey if TLS-based method is active |
| 939 | 939 | if ($clientCertRequired) { |
| 940 | - echo "<tr><td colspan='2'><strong>" . _("Certificate-based EAP types") . "</strong></td></tr> |
|
| 941 | - <tr><td>" . _("Certificate file (.p12 or .pfx):") . "</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr> |
|
| 942 | - <tr><td>" . _("Certificate password, if any:") . "</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr> |
|
| 943 | - <tr><td>" . _("Username, if different from certificate Subject:") . "</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>"; |
|
| 940 | + echo "<tr><td colspan='2'><strong>"._("Certificate-based EAP types")."</strong></td></tr> |
|
| 941 | + <tr><td>" . _("Certificate file (.p12 or .pfx):")."</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr> |
|
| 942 | + <tr><td>" . _("Certificate password, if any:")."</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr> |
|
| 943 | + <tr><td>" . _("Username, if different from certificate Subject:")."</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>"; |
|
| 944 | 944 | } |
| 945 | - echo "<tr><td colspan='2'><button id='submit_credentials'>" . _("Submit credentials") . "</button></td></tr></table></form>"; |
|
| 945 | + echo "<tr><td colspan='2'><button id='submit_credentials'>"._("Submit credentials")."</button></td></tr></table></form>"; |
|
| 946 | 946 | echo "<div id='live_login_results' style='display:none'>"; |
| 947 | 947 | foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) { |
| 948 | 948 | print "<hr>"; |
| 949 | - printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>"); |
|
| 950 | - print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src" . $hostindex . "_img' style='width:24px; position: absolute; $start: 20px; bottom: 0px; '></span>"; |
|
| 949 | + printf(_("Testing from: %s"), "<strong>".\config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>"); |
|
| 950 | + print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src".$hostindex."_img' style='width:24px; position: absolute; $start: 20px; bottom: 0px; '></span>"; |
|
| 951 | 951 | print "<div id='eap_test$hostindex' class='eap_test_results'></div>"; |
| 952 | 952 | } |
| 953 | 953 | echo "</div>"; |
@@ -962,9 +962,9 @@ discard block |
||
| 962 | 962 | } |
| 963 | 963 | |
| 964 | 964 | if (isset($_POST['comefrom'])) { |
| 965 | - $return = htmlspecialchars_decode($_POST['comefrom']) . ( $inst_id ? "?inst_id=" . $inst_id : "" ); |
|
| 965 | + $return = htmlspecialchars_decode($_POST['comefrom']).($inst_id ? "?inst_id=".$inst_id : ""); |
|
| 966 | 966 | echo "<form method='post' action='$return' accept-charset='UTF-8'> |
| 967 | - <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CLOSE . "'>" . sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_idp) . "</button>" |
|
| 967 | + <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CLOSE."'>".sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_idp)."</button>" |
|
| 968 | 968 | . "</form>"; |
| 969 | 969 | } |
| 970 | 970 | if ($check_realm !== FALSE) { |
