GEANT /
CAT
@@ -34,9 +34,9 @@ |
||
| 34 | 34 | $skinObject = new \web\lib\user\Skinjob("classic"); |
| 35 | 35 | /// eduroam CAT, twice the consortium name eduroam, twice eduroam CAT |
| 36 | 36 | $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform."), \config\Master::APPEARANCE['productname'])."<p>". |
| 37 | - sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
| 38 | - "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
| 39 | - "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
| 37 | + sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
| 38 | + "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
| 39 | + "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
| 40 | 40 | \config\Master::APPEARANCE['productname'], |
| 41 | 41 | \config\ConfAssistant::CONSORTIUM['display_name'], |
| 42 | 42 | \config\ConfAssistant::CONSORTIUM['display_name'], |
@@ -42,24 +42,24 @@ |
||
| 42 | 42 | \config\ConfAssistant::CONSORTIUM['display_name'], |
| 43 | 43 | \config\Master::APPEARANCE['productname'], |
| 44 | 44 | \config\Master::APPEARANCE['productname']); |
| 45 | -$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>"; |
|
| 46 | -$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>"; |
|
| 45 | +$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>"; |
|
| 46 | +$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>"; |
|
| 47 | 47 | foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) { |
| 48 | - $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>"; |
|
| 48 | + $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>"; |
|
| 49 | 49 | } |
| 50 | 50 | $out .= "</tr>"; |
| 51 | 51 | foreach (\devices\Devices::listDevices() as $index => $onedevice) { |
| 52 | 52 | if (isset($onedevice['options'])) { |
| 53 | - if ((isset($onedevice['options']['hidden']) && ( $onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2 ))|| (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) { |
|
| 53 | + if ((isset($onedevice['options']['hidden']) && ($onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2)) || (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) { |
|
| 54 | 54 | continue; |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | - $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png"); |
|
| 57 | + $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png"); |
|
| 58 | 58 | $vendorImg = ""; |
| 59 | 59 | if ($vendor !== FALSE) { |
| 60 | 60 | $vendorImg = "<img src='$vendor' alt='logo'>"; |
| 61 | 61 | } |
| 62 | - $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>"; |
|
| 62 | + $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>"; |
|
| 63 | 63 | $device_instance = new \core\DeviceFactory($index); |
| 64 | 64 | foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) { |
| 65 | 65 | $out .= "<td>"; |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $dom = new \DOMDocument('1.0', 'utf-8'); |
| 145 | 145 | $root = $dom->createElement($rootname); |
| 146 | 146 | $dom->appendChild($root); |
| 147 | - $ns = $dom->createAttributeNS( 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation' ); |
|
| 147 | + $ns = $dom->createAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation'); |
|
| 148 | 148 | $ns->value = "eap-metadata.xsd"; |
| 149 | 149 | $root->appendChild($ns); |
| 150 | 150 | $this->openRoamingToU = sprintf(_("I have read and agree to OpenRoaming Terms of Use at %s."), "https://wballiance.com/openroaming/toc-2020/"); |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | if ($netDefinition['condition'] === 'internal:openroaming' && |
| 182 | 182 | $this->attributes['internal:openroaming']) { |
| 183 | 183 | $this->setORtou(); |
| 184 | - if (preg_match("/^ask/",$this->attributes['media:openroaming'][0])) { |
|
| 184 | + if (preg_match("/^ask/", $this->attributes['media:openroaming'][0])) { |
|
| 185 | 185 | $orNetwork = $netDefinition; |
| 186 | 186 | continue; |
| 187 | 187 | } |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | private function setORtou() { |
| 241 | - if (preg_match("/preagreed/",$this->attributes['media:openroaming'][0])) { |
|
| 241 | + if (preg_match("/preagreed/", $this->attributes['media:openroaming'][0])) { |
|
| 242 | 242 | $this->addORtou = false; |
| 243 | 243 | } else { |
| 244 | 244 | $this->addORtou = true; |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | $authMethods = new \core\DeviceXMLmain(); |
| 263 | 263 | $authMethods->setChild('AuthenticationMethod', $this->authMethodsList); |
| 264 | 264 | $eapIdp->setChild('AuthenticationMethods', $authMethods); |
| 265 | - $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids,$oids)); |
|
| 265 | + $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids, $oids)); |
|
| 266 | 266 | // TODO $eap_idp->setChild('ValidUntil',$this->getValidUntil()); |
| 267 | 267 | $eapIdp->setChild('ProviderInfo', $this->providerInfo); |
| 268 | 268 | // TODO $eap_idp->setChild('VendorSpecific',$this->getVendorSpecific()); |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | $lng = $lngAttr['lang'] === 'any' ? \config\Master::APPEARANCE['defaultlocale'] : $lngAttr['lang']; |
| 417 | 417 | $tou .= "\n".$this->openRoamingToUArray[$lng]; |
| 418 | 418 | $touObj->setValue($tou); |
| 419 | - $out[] = $touObj; |
|
| 419 | + $out[] = $touObj; |
|
| 420 | 420 | } |
| 421 | 421 | } else { |
| 422 | 422 | $tou = $standardTou[0]; |
@@ -654,7 +654,7 @@ |
||
| 654 | 654 | </button> |
| 655 | 655 | <span style='color: red;'> |
| 656 | 656 | <?php if ($hasMail == 0) { |
| 657 | - echo _("Helpdesk mail address is required but missing!"); |
|
| 657 | + echo _("Helpdesk mail address is required but missing!"); |
|
| 658 | 658 | } |
| 659 | 659 | ?> |
| 660 | 660 | </span> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) { |
| 32 | 32 | ?> |
@@ -43,14 +43,14 @@ discard block |
||
| 43 | 43 | <ul style='margin:1px'> |
| 44 | 44 | <?php |
| 45 | 45 | foreach ($completeness as $missing_attrib) { |
| 46 | - echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 46 | + echo "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 47 | 47 | } |
| 48 | 48 | ?> |
| 49 | 49 | </ul> |
| 50 | 50 | </div> |
| 51 | 51 | <?php |
| 52 | 52 | } else { |
| 53 | - echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
| 53 | + echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
| 54 | 54 | } |
| 55 | 55 | ?> |
| 56 | 56 | <br/> |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | if ($readonly === FALSE) { |
| 60 | 60 | ?> |
| 61 | 61 | <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&profile_id=<?php echo $theProfile->identifier; ?>' method='POST'> |
| 62 | - <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 62 | + <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 63 | 63 | </form> |
| 64 | 64 | <?php |
| 65 | 65 | } |
@@ -95,21 +95,21 @@ discard block |
||
| 95 | 95 | $has_overrides = TRUE; |
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 98 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>"; |
|
| 99 | 99 | $typelist = $theProfile->getEapMethodsinOrderOfPreference(); |
| 100 | 100 | $allcomplete = TRUE; |
| 101 | 101 | foreach ($typelist as $eaptype) { |
| 102 | 102 | $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
| 103 | 103 | $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype); |
| 104 | 104 | if ($completeness === true) { |
| 105 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 105 | + $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>"; |
|
| 106 | 106 | } else { |
| 107 | 107 | $buffer_eaptypediv .= " <div class='notacceptable'>"; |
| 108 | 108 | $buffer_eaptypediv .= _("Information needed!"); |
| 109 | 109 | if (is_array($completeness)) { |
| 110 | 110 | $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
| 111 | 111 | foreach ($completeness as $missing_attrib) { |
| 112 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 112 | + $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 113 | 113 | } |
| 114 | 114 | $buffer_eaptypediv .= "</ul>"; |
| 115 | 115 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | foreach ($attribs as $attrib) { |
| 122 | 122 | if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
| 123 | 123 | $justOnce = TRUE; |
| 124 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 124 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='"._("Options on EAP Method/Device level are in effect.")."'>"; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | $buffer_eaptypediv .= "<br/>"; |
@@ -148,15 +148,15 @@ discard block |
||
| 148 | 148 | switch ($certStatus) { |
| 149 | 149 | case core\AbstractProfile::CERT_STATUS_OK: |
| 150 | 150 | $iconData = $uiElements->iconData('CERT_STATUS_OK'); |
| 151 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 151 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 152 | 152 | break; |
| 153 | 153 | case core\AbstractProfile::CERT_STATUS_WARN: |
| 154 | 154 | $iconData = $uiElements->iconData('CERT_STATUS_WARN'); |
| 155 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 155 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 156 | 156 | break; |
| 157 | 157 | case core\AbstractProfile::CERT_STATUS_ERROR: |
| 158 | 158 | $iconData = $uiElements->iconData('CERT_STATUS_ERROR'); |
| 159 | - $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData)); |
|
| 159 | + $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData)); |
|
| 160 | 160 | break; |
| 161 | 161 | } |
| 162 | 162 | $buffer_headline .= "</div>"; |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
| 183 | 183 | $diagUrl = "../diag/"; |
| 184 | 184 | } else { |
| 185 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
| 185 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
| 186 | 186 | } |
| 187 | 187 | ?> |
| 188 | - <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 189 | - <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 188 | + <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 189 | + <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 190 | 190 | <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'> |
| 191 | 191 | <?php echo _("Check realm reachability"); ?> |
| 192 | 192 | </button> |
@@ -228,9 +228,9 @@ discard block |
||
| 228 | 228 | ?> |
| 229 | 229 | <div style='display: flex;'> |
| 230 | 230 | <?php |
| 231 | - $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution; |
|
| 232 | - $displayurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 233 | - $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 231 | + $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution; |
|
| 232 | + $displayurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 233 | + $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 234 | 234 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
| 235 | 235 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
| 236 | 236 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -242,9 +242,9 @@ discard block |
||
| 242 | 242 | if (empty($rawQr)) { |
| 243 | 243 | throw new Exception("Something went seriously wrong during QR code generation!"); |
| 244 | 244 | } |
| 245 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 245 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 246 | 246 | $size = getimagesize($uri); |
| 247 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
| 247 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
| 248 | 248 | |
| 249 | 249 | //echo "<nobr>$displayurl</nobr></a>"; |
| 250 | 250 | echo "<p>$displayurl</p></a>"; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | <h2><?php |
| 289 | 289 | switch ($deploymentObject->consortium) { |
| 290 | 290 | case "eduroam": |
| 291 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME; |
|
| 291 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME; |
|
| 292 | 292 | break; |
| 293 | 293 | case "OpenRoaming": |
| 294 | 294 | $displayname = "OpenRoaming ANP"; |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | default: |
| 297 | 297 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
| 298 | 298 | } |
| 299 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
| 299 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
| 300 | 300 | ?></h2> |
| 301 | 301 | <table> |
| 302 | 302 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -310,13 +310,13 @@ discard block |
||
| 310 | 310 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
| 311 | 311 | <?php |
| 312 | 312 | if ($deploymentObject->host1_v4 !== NULL) { |
| 313 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
| 313 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
| 314 | 314 | } |
| 315 | 315 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
| 316 | 316 | echo "<br/>"; |
| 317 | 317 | } |
| 318 | 318 | if ($deploymentObject->host1_v6 !== NULL) { |
| 319 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
| 319 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
| 320 | 320 | } |
| 321 | 321 | ?> |
| 322 | 322 | </td> |
@@ -324,9 +324,9 @@ discard block |
||
| 324 | 324 | <td><?php echo $deploymentObject->port1; ?></td> |
| 325 | 325 | <td> |
| 326 | 326 | <?php |
| 327 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 328 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 329 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>"; |
|
| 327 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 328 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 329 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>"; |
|
| 330 | 330 | ?> |
| 331 | 331 | </td> |
| 332 | 332 | </tr> |
@@ -334,22 +334,22 @@ discard block |
||
| 334 | 334 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
| 335 | 335 | <?php |
| 336 | 336 | if ($deploymentObject->host2_v4 !== NULL) { |
| 337 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
| 337 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
| 338 | 338 | } |
| 339 | 339 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
| 340 | 340 | echo "<br/>"; |
| 341 | 341 | } |
| 342 | 342 | if ($deploymentObject->host2_v6 !== NULL) { |
| 343 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
| 343 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
| 344 | 344 | } |
| 345 | 345 | ?></td> |
| 346 | 346 | <td><?php echo _("RADIUS port number: ") ?></td> |
| 347 | 347 | <td><?php echo $deploymentObject->port2; ?></td> |
| 348 | 348 | <td> |
| 349 | 349 | <?php |
| 350 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 351 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 352 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>"; |
|
| 350 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 351 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 352 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>"; |
|
| 353 | 353 | ?> |
| 354 | 354 | </td> |
| 355 | 355 | </tr> |
@@ -401,12 +401,12 @@ discard block |
||
| 401 | 401 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
| 402 | 402 | echo '<br>'; |
| 403 | 403 | if ($res['FAILURE'] == 2) { |
| 404 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
| 404 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
| 405 | 405 | } else { |
| 406 | 406 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 407 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
| 407 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
| 408 | 408 | } else { |
| 409 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
| 409 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
| 410 | 410 | } |
| 411 | 411 | } |
| 412 | 412 | } |
@@ -441,12 +441,12 @@ discard block |
||
| 441 | 441 | if ($res['FAILURE'] > 0) { |
| 442 | 442 | echo '<br>'; |
| 443 | 443 | if ($res['FAILURE'] == 2) { |
| 444 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
| 444 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
| 445 | 445 | } else { |
| 446 | 446 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 447 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
| 447 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
| 448 | 448 | } else { |
| 449 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
| 449 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | } |
@@ -467,24 +467,24 @@ discard block |
||
| 467 | 467 | </div> |
| 468 | 468 | <div style='width:20px;'></div> <!-- QR code space, reserved --> |
| 469 | 469 | <div style='display: table-cell; min-width:200px;'> |
| 470 | - <?php $tablecaption = _("Hotspot Usage Statistics");?> |
|
| 470 | + <?php $tablecaption = _("Hotspot Usage Statistics"); ?> |
|
| 471 | 471 | <h1><?php echo $tablecaption; ?></h1> |
| 472 | - <h2><?php echo _("5 most recent authentications");?></h2> |
|
| 473 | - <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p> |
|
| 472 | + <h2><?php echo _("5 most recent authentications"); ?></h2> |
|
| 473 | + <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p> |
|
| 474 | 474 | <table class='authrecord'> |
| 475 | - <caption><?php echo $tablecaption;?></caption> |
|
| 475 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 476 | 476 | <tr style='text-align: left;'> |
| 477 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
| 478 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
| 479 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
| 480 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
| 481 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
| 482 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
| 477 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
| 478 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
| 479 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
| 480 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
| 481 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
| 482 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
| 483 | 483 | </tr> |
| 484 | 484 | <?php |
| 485 | - $userAuthData = $deploymentObject->retrieveStatistics(0,5); |
|
| 485 | + $userAuthData = $deploymentObject->retrieveStatistics(0, 5); |
|
| 486 | 486 | foreach ($userAuthData as $oneRecord) { |
| 487 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
| 487 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
| 488 | 488 | . "<td>".$oneRecord['activity_time']."</td>" |
| 489 | 489 | . "<td>".$oneRecord['realm']."</td>" |
| 490 | 490 | . "<td>".$oneRecord['mac']."</td>" |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | <div> |
| 710 | 710 | <input type="hidden" name="consortium" value="eduroam"/> |
| 711 | 711 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
| 712 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 712 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 713 | 713 | </button> |
| 714 | 714 | <span style='color: red;'> |
| 715 | 715 | <?php if ($hasMail == 0) { |
@@ -156,12 +156,12 @@ |
||
| 156 | 156 | } |
| 157 | 157 | if (isset($_POST['command'])) { |
| 158 | 158 | switch ($_POST['command']) { |
| 159 | - case web\lib\common\FormElements::BUTTON_CLOSE: |
|
| 160 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 161 | - exit(0); |
|
| 162 | - default: |
|
| 163 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 164 | - exit(0); |
|
| 159 | + case web\lib\common\FormElements::BUTTON_CLOSE: |
|
| 160 | + header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 161 | + exit(0); |
|
| 162 | + default: |
|
| 163 | + header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 164 | + exit(0); |
|
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | $vlan = $deployment->getAttributes("managedsp:vlan")[0]['value'] ?? NULL; |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $deco = new \web\lib\admin\PageDecoration(); |
| 32 | 32 | $validator = new \web\lib\common\InputValidation(); |
@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 ) |
| 41 | 41 | ) |
| 42 | 42 | ) {*/ |
| 43 | - if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 43 | + if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 44 | 44 | { |
| 45 | 45 | $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']); |
| 46 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 46 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 47 | 47 | exit(0); |
| 48 | 48 | } else { |
| 49 | 49 | throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!"); |
@@ -100,18 +100,18 @@ discard block |
||
| 100 | 100 | if (isset($_POST['agreement']) && $_POST['agreement'] == "true") { |
| 101 | 101 | $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1); |
| 102 | 102 | } |
| 103 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 103 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 104 | 104 | exit(0); |
| 105 | 105 | case web\lib\common\FormElements::BUTTON_DELETE: |
| 106 | 106 | $response = $deployment->setRADIUSconfig(); |
| 107 | 107 | if (in_array('OK', $response)) { |
| 108 | 108 | $deployment->deactivate(); |
| 109 | 109 | } |
| 110 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 110 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 111 | 111 | exit(0); |
| 112 | 112 | case web\lib\common\FormElements::BUTTON_REMOVESP: |
| 113 | 113 | $deployment->remove(); |
| 114 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 114 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 115 | 115 | exit(0); |
| 116 | 116 | case web\lib\common\FormElements::BUTTON_ACTIVATE: |
| 117 | 117 | if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) { |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | if (in_array('OK', $response)) { |
| 120 | 120 | $deployment->activate(); |
| 121 | 121 | } |
| 122 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 122 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 123 | 123 | exit(0); |
| 124 | 124 | } else { |
| 125 | 125 | throw new Exception("Activate button pushed without acknowledged ToUs!"); |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | } else { |
| 149 | 149 | $response = ['NOOP', 'NOOP']; |
| 150 | 150 | } |
| 151 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 151 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 152 | 152 | exit(0); |
| 153 | 153 | default: |
| 154 | 154 | throw new Exception("Unknown button action requested!"); |
@@ -157,10 +157,10 @@ discard block |
||
| 157 | 157 | if (isset($_POST['command'])) { |
| 158 | 158 | switch ($_POST['command']) { |
| 159 | 159 | case web\lib\common\FormElements::BUTTON_CLOSE: |
| 160 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 160 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 161 | 161 | exit(0); |
| 162 | 162 | default: |
| 163 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 163 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 164 | 164 | exit(0); |
| 165 | 165 | } |
| 166 | 166 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | echo $uiElements->instLevelInfoBoxes($my_inst); |
| 188 | 188 | $deploymentOptions = $deployment->getAttributes(); |
| 189 | 189 | echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'> |
| 190 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 190 | + <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 191 | 191 | $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE); |
| 192 | 192 | ?> |
| 193 | 193 | <fieldset class='option_container' id='managedsp_override'> |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | <!-- input for VLAN identifier for home users--> |
| 222 | 222 | <td> |
| 223 | 223 | <span id='vlan_label'> |
| 224 | - <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?> |
|
| 224 | + <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?> |
|
| 225 | 225 | </span> |
| 226 | 226 | </td> |
| 227 | 227 | <td> |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | </fieldset> |
| 242 | 242 | |
| 243 | 243 | <?php |
| 244 | - echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>"; |
|
| 244 | + echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>"; |
|
| 245 | 245 | echo $deco->footer(); |
| 246 | 246 | |
| 247 | 247 | |
| 248 | 248 | \ No newline at end of file |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | * ****************************************************************************** |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | -require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
| 12 | +require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
| 13 | 13 | |
| 14 | 14 | $auth = new \web\lib\admin\Authentication(); |
| 15 | 15 | $auth->authenticate(); |
@@ -37,21 +37,21 @@ discard block |
||
| 37 | 37 | ?> |
| 38 | 38 | |
| 39 | 39 | <h1><?php $tablecaption = _("Deployment Usage Records"); echo $tablecaption; ?></h1> |
| 40 | -<p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p> |
|
| 40 | +<p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p> |
|
| 41 | 41 | <table class='authrecord'> |
| 42 | - <caption><?php echo $tablecaption;?></caption> |
|
| 42 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 43 | 43 | <tr> |
| 44 | - <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th> |
|
| 45 | - <th scope="col"><strong><?php echo _("Realm");?></strong></th> |
|
| 46 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
| 47 | - <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> |
|
| 48 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
| 49 | - <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th> |
|
| 44 | + <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th> |
|
| 45 | + <th scope="col"><strong><?php echo _("Realm"); ?></strong></th> |
|
| 46 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
| 47 | + <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> |
|
| 48 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
| 49 | + <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th> |
|
| 50 | 50 | </tr> |
| 51 | 51 | <?php |
| 52 | 52 | $userAuthData = $deployment->retrieveStatistics($backlogTime); |
| 53 | 53 | foreach ($userAuthData as $oneRecord) { |
| 54 | - echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>" |
|
| 54 | + echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>" |
|
| 55 | 55 | . "<td>".$oneRecord['activity_time']."</td>" |
| 56 | 56 | // $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here |
| 57 | 57 | . "<td>".$oneRecord['realm']."</td>" |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id; |
| 291 | 291 | } |
| 292 | 292 | if ($clients > $maxSupportedClients * 0.9) { |
| 293 | - $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!"); |
|
| 293 | + $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!"); |
|
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | 296 | if (count($serverCandidates) == 0 && $federation != "DEFAULT") { |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND)"; |
| 330 | 330 | $conditional2 = ""; |
| 331 | 331 | } |
| 332 | - $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName ); |
|
| 332 | + $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName); |
|
| 333 | 333 | return mysqli_fetch_all($stats, \MYSQLI_ASSOC); |
| 334 | 334 | } |
| 335 | 335 | |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | { |
| 447 | 447 | $customAttrib = $this->getAttributes("managedsp:operatorname"); |
| 448 | 448 | if (count($customAttrib) == 0) { |
| 449 | - return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
| 449 | + return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
| 450 | 450 | } |
| 451 | 451 | return $customAttrib[0]["value"]; |
| 452 | 452 | } |
@@ -462,13 +462,13 @@ discard block |
||
| 462 | 462 | { |
| 463 | 463 | |
| 464 | 464 | $hostname = "radius_hostname_$idx"; |
| 465 | - $ch = curl_init("http://" . $this->$hostname); |
|
| 465 | + $ch = curl_init("http://".$this->$hostname); |
|
| 466 | 466 | if ($ch === FALSE) { |
| 467 | 467 | $res = 'FAILURE'; |
| 468 | 468 | } else { |
| 469 | 469 | curl_setopt($ch, CURLOPT_POST, 1); |
| 470 | 470 | curl_setopt($ch, CURLOPT_POSTFIELDS, $post); |
| 471 | - $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $post\n"); |
|
| 471 | + $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $post\n"); |
|
| 472 | 472 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); |
| 473 | 473 | curl_setopt($ch, CURLOPT_HEADER, 0); |
| 474 | 474 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
@@ -507,19 +507,19 @@ discard block |
||
| 507 | 507 | } else { |
| 508 | 508 | $txt = $remove ? _('Profile deactivation failed') : _('Profile activation/modification failed'); |
| 509 | 509 | } |
| 510 | - $txt = $txt . ' '; |
|
| 510 | + $txt = $txt.' '; |
|
| 511 | 511 | if (array_count_values($response)[$status] == 2) { |
| 512 | - $txt = $txt . _('on both RADIUS servers: primary and backup') . '.'; |
|
| 512 | + $txt = $txt._('on both RADIUS servers: primary and backup').'.'; |
|
| 513 | 513 | } else { |
| 514 | 514 | if ($response['res[1]'] == $status) { |
| 515 | - $txt = $txt . _('on primary RADIUS server') . '.'; |
|
| 515 | + $txt = $txt._('on primary RADIUS server').'.'; |
|
| 516 | 516 | } else { |
| 517 | - $txt = $txt . _('on backup RADIUS server') . '.'; |
|
| 517 | + $txt = $txt._('on backup RADIUS server').'.'; |
|
| 518 | 518 | } |
| 519 | 519 | } |
| 520 | 520 | $mail = \core\common\OutsideComm::mailHandle(); |
| 521 | 521 | $email = $this->getAttributes("support:email")[0]['value']; |
| 522 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System"; |
|
| 522 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System"; |
|
| 523 | 523 | $mail->addAddress($email); |
| 524 | 524 | if ($status == 'OK') { |
| 525 | 525 | $mail->Subject = _('RADIUS profile update problem fixed'); |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | return NULL; |
| 554 | 554 | } |
| 555 | 555 | $timeout = 10; |
| 556 | - curl_setopt($ch, CURLOPT_URL, 'http://' . $host); |
|
| 556 | + curl_setopt($ch, CURLOPT_URL, 'http://'.$host); |
|
| 557 | 557 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
| 558 | 558 | curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
| 559 | 559 | curl_exec($ch); |
@@ -645,33 +645,33 @@ discard block |
||
| 645 | 645 | { |
| 646 | 646 | $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1; |
| 647 | 647 | $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => '')); |
| 648 | - $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&'; |
|
| 648 | + $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&'; |
|
| 649 | 649 | if ($remove) { |
| 650 | - $toPostTemplate = $toPostTemplate . 'remove=1&'; |
|
| 650 | + $toPostTemplate = $toPostTemplate.'remove=1&'; |
|
| 651 | 651 | } else { |
| 652 | - $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getOperatorName() . '&'; |
|
| 652 | + $toPostTemplate = $toPostTemplate.'operatorname='.$this->getOperatorName().'&'; |
|
| 653 | 653 | if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) { |
| 654 | 654 | $allRealms = $this->getAllRealms(); |
| 655 | 655 | if (!empty($allRealms)) { |
| 656 | - $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&'; |
|
| 657 | - $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&'; |
|
| 656 | + $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&'; |
|
| 657 | + $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&'; |
|
| 658 | 658 | } |
| 659 | 659 | } |
| 660 | 660 | } |
| 661 | 661 | foreach (array_keys($toPost) as $key) { |
| 662 | - $elem = 'port' . $key; |
|
| 663 | - $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem; |
|
| 662 | + $elem = 'port'.$key; |
|
| 663 | + $toPost[$key] = $toPostTemplate.'port='.$this->$elem; |
|
| 664 | 664 | } |
| 665 | 665 | $response = array(); |
| 666 | 666 | foreach ($toPost as $key => $value) { |
| 667 | - $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n"); |
|
| 668 | - $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 667 | + $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n"); |
|
| 668 | + $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 669 | 669 | } |
| 670 | 670 | if ($onlyone) { |
| 671 | - $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK; |
|
| 671 | + $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK; |
|
| 672 | 672 | } |
| 673 | 673 | foreach (array('OK', 'FAILURE') as $status) { |
| 674 | - if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) { |
|
| 674 | + if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) { |
|
| 675 | 675 | $this->sendMailtoAdmin($remove, $response, $status); |
| 676 | 676 | } |
| 677 | 677 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * It works on two CAs, the RSA and ECDSA variant. There is a separate temp |
| 29 | 29 | * subdir for both ( temp_ocsp_RSA and temp_ocsp_ECDSA ). |
| 30 | 30 | */ |
| 31 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 31 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 32 | 32 | |
| 33 | 33 | /* If the RADIUS server is supposed to generate meaningful (temporally stable, |
| 34 | 34 | * per user, per SP identifiers, then it needs to compute them on the username, |
@@ -159,7 +159,7 @@ |
||
| 159 | 159 | echo "0\">"; |
| 160 | 160 | echo _("This service is for authenticated admins only.") . '<br>'; |
| 161 | 161 | echo "<a href=\"diag.php?admin=1\">" . |
| 162 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 162 | + _("eduroam® admin access is needed") . "</a>"; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | <div id="realm_problem"> |
@@ -47,9 +47,9 @@ discard block |
||
| 47 | 47 | $Gui->loggerInstance->debug(4, $operatingSystem); |
| 48 | 48 | $uiElements = new web\lib\admin\UIElements(); |
| 49 | 49 | if ($operatingSystem) { |
| 50 | - print "recognisedOS = '" . $operatingSystem['device'] . "';\n"; |
|
| 50 | + print "recognisedOS = '".$operatingSystem['device']."';\n"; |
|
| 51 | 51 | } |
| 52 | -require dirname(__DIR__) . '/user/js/cat_js.php'; |
|
| 52 | +require dirname(__DIR__).'/user/js/cat_js.php'; |
|
| 53 | 53 | $cssUrl = $Gui->skinObject->findResourceUrl("CSS", "cat-user.css.php"); |
| 54 | 54 | ?> |
| 55 | 55 | </script> |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | <?php |
| 64 | 64 | echo $divs->divHeading($visibility); |
| 65 | 65 | $Gui->languageInstance->setTextDomain("diagnostics"); |
| 66 | -require dirname(__DIR__) . '/diag/js/diag_js.php'; |
|
| 66 | +require dirname(__DIR__).'/diag/js/diag_js.php'; |
|
| 67 | 67 | ?> |
| 68 | 68 | <div id="main_page"> |
| 69 | 69 | <div id="loading_ico"> |
@@ -79,12 +79,12 @@ discard block |
||
| 79 | 79 | </div> |
| 80 | 80 | <div id="main_body"> |
| 81 | 81 | <div id="user_page"> |
| 82 | - <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?> |
|
| 82 | + <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?> |
|
| 83 | 83 | <div id="user_info" style='padding-top: 10px;'> |
| 84 | 84 | <div id='diagnostic_choice'> |
| 85 | - <?php echo _("The diagnostics system will do its best to identify and resolve your problems!") . ' ' . _("Please help the system by answering the questions as precisely as possible.") . "<br/>" . _("Are you a") . ' '; ?> |
|
| 86 | - <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?> |
|
| 87 | - <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?> |
|
| 85 | + <?php echo _("The diagnostics system will do its best to identify and resolve your problems!").' '._("Please help the system by answering the questions as precisely as possible.")."<br/>"._("Are you a").' '; ?> |
|
| 86 | + <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?> |
|
| 87 | + <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?> |
|
| 88 | 88 | </div> |
| 89 | 89 | <div id='diagnostic_enduser' style='display: none;'> |
| 90 | 90 | <h2><?php echo _("Tools for End Users"); ?></h2> |
@@ -94,24 +94,24 @@ discard block |
||
| 94 | 94 | ?> |
| 95 | 95 | </p> |
| 96 | 96 | <?php |
| 97 | - echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>'; |
|
| 97 | + echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>'; |
|
| 98 | 98 | echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<strong>realm.tld</strong>'):"); |
| 99 | 99 | ?> |
| 100 | 100 | <input type='text' name='user_realm' id='user_realm' value=''> |
| 101 | 101 | <?php |
| 102 | - echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>'; |
|
| 103 | - echo _("You can select your home institution from the following list") . '<br/>'; |
|
| 102 | + echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>'; |
|
| 103 | + echo _("You can select your home institution from the following list").'<br/>'; |
|
| 104 | 104 | echo '<div id="select_idp_country"><a href="" id="idp_countries_list">'; |
| 105 | - echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>'; |
|
| 105 | + echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>'; |
|
| 106 | 106 | ?> |
| 107 | 107 | <div id="select_idp_area" style="display:none;"> |
| 108 | 108 | </div> |
| 109 | 109 | </div> |
| 110 | 110 | <div id="position_info"> |
| 111 | 111 | <?php |
| 112 | - echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>'; |
|
| 112 | + echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>'; |
|
| 113 | 113 | echo '<div id="select_sp_country"><a href="" id="sp_countries_list">'; |
| 114 | - echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>'; |
|
| 114 | + echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>'; |
|
| 115 | 115 | ?> |
| 116 | 116 | <div id="select_sp_area" style="display:none;"> |
| 117 | 117 | </div> |
@@ -144,11 +144,11 @@ discard block |
||
| 144 | 144 | echo 'none'; |
| 145 | 145 | } |
| 146 | 146 | echo ";'>"; |
| 147 | - echo '<h3>' . _("What is the nature of the problem?") . '</h3>'; |
|
| 148 | - echo '<input type="radio" name="problem_type" value="0"' . (($sp==1)? ' checked' : '') . '>'; |
|
| 149 | - echo _("I suspect a technical problem at a particular IdP") . '<br>'; |
|
| 147 | + echo '<h3>'._("What is the nature of the problem?").'</h3>'; |
|
| 148 | + echo '<input type="radio" name="problem_type" value="0"'.(($sp == 1) ? ' checked' : '').'>'; |
|
| 149 | + echo _("I suspect a technical problem at a particular IdP").'<br>'; |
|
| 150 | 150 | echo '<input type="radio" name="problem_type" value="1">'; |
| 151 | - echo _("I want to report abuse of network resources by a roaming user") . '<br>'; |
|
| 151 | + echo _("I want to report abuse of network resources by a roaming user").'<br>'; |
|
| 152 | 152 | echo '<input type="radio" name="problem_type" value="2">'; |
| 153 | 153 | echo _("I suspect a technical problem for one of my users at a particular SP"); |
| 154 | 154 | echo "<div id='idp_contact_area'></div>"; |
@@ -157,9 +157,9 @@ discard block |
||
| 157 | 157 | echo "</div>"; |
| 158 | 158 | } else { |
| 159 | 159 | echo "0\">"; |
| 160 | - echo _("This service is for authenticated admins only.") . '<br>'; |
|
| 161 | - echo "<a href=\"diag.php?admin=1\">" . |
|
| 162 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 160 | + echo _("This service is for authenticated admins only.").'<br>'; |
|
| 161 | + echo "<a href=\"diag.php?admin=1\">". |
|
| 162 | + _("eduroam® admin access is needed")."</a>"; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | <div id="realm_problem"> |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | return false; |
| 238 | 238 | }); |
| 239 | 239 | $(document).on('change', '#idp_country' , function() { |
| 240 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 240 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 241 | 241 | var id = $(this).attr('id'); |
| 242 | 242 | var k = id.indexOf('_'); |
| 243 | 243 | var type = id.substr(0,k); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | var shtml = ''; |
| 256 | 256 | var select = ''; |
| 257 | 257 | if (type !== 'asp') { |
| 258 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 258 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 259 | 259 | } |
| 260 | 260 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 261 | 261 | for (var i in institutions) { |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | } else { |
| 277 | 277 | if (data.status === 0) { |
| 278 | 278 | inProgress(0); |
| 279 | - var msg = <?php echo '"' . _("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.") . '"'; ?>; |
|
| 279 | + var msg = <?php echo '"'._("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.").'"'; ?>; |
|
| 280 | 280 | alert(msg); |
| 281 | 281 | $('#select_idp_country').show(); |
| 282 | 282 | $('#select_idp_area').hide(); |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | }, |
| 286 | 286 | error:function() { |
| 287 | 287 | inProgress(0); |
| 288 | - var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>; |
|
| 288 | + var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>; |
|
| 289 | 289 | alert(msg); |
| 290 | 290 | $('#select_idp_country').show(); |
| 291 | 291 | $('#select_idp_area').hide(); |
@@ -301,9 +301,9 @@ discard block |
||
| 301 | 301 | }); |
| 302 | 302 | $(document).on('change', '#select_sp_problem' , function() { |
| 303 | 303 | if ($('#select_sp_problem').val().substr(0,6) == 'abuse-') { |
| 304 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check if this realm is registered") . '"'; ?>); |
|
| 304 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check if this realm is registered").'"'; ?>); |
|
| 305 | 305 | } else { |
| 306 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check this realm") . '"'; ?>); |
|
| 306 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check this realm").'"'; ?>); |
|
| 307 | 307 | } |
| 308 | 308 | $('#realm_in_db_admin').hide(); |
| 309 | 309 | $('#admin_realm').val(''); |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | clear_sp_question(); |
| 312 | 312 | }); |
| 313 | 313 | $(document).on('change', '#sp_country, #asp_country' , function() { |
| 314 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 314 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 315 | 315 | var id = $(this).attr('id'); |
| 316 | 316 | var k = id.indexOf('_'); |
| 317 | 317 | var type = id.substr(0,k); |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | var shtml = ''; |
| 330 | 330 | var select = ''; |
| 331 | 331 | if (type !== 'asp') { |
| 332 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 332 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 333 | 333 | } |
| 334 | 334 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 335 | 335 | for (var i in hotspots) { |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | inProgress(0); |
| 353 | 353 | var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">'; |
| 354 | 354 | var shtml = '<td></td><td>'; |
| 355 | - select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>'; |
|
| 355 | + select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>'; |
|
| 356 | 356 | if (type !== 'asp') { |
| 357 | 357 | $('#row_' + type + '_institution').html(''); |
| 358 | 358 | $('#row_' + type + '_institution').append(shtml + select); |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | $('#start_test_area').hide(); |
| 387 | 387 | return false; |
| 388 | 388 | } |
| 389 | - var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>; |
|
| 389 | + var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>; |
|
| 390 | 390 | inProgress(1, comment); |
| 391 | 391 | $.ajax({ |
| 392 | 392 | url: "findRealm.php", |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | var realms = data.realms; |
| 399 | 399 | var realmselect = ''; |
| 400 | 400 | if (realms.length > 1) { |
| 401 | - realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>; |
|
| 401 | + realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>; |
|
| 402 | 402 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 403 | 403 | for (var i in realms) { |
| 404 | 404 | realmselect = realmselect + '<input type="radio" name="realm" '; |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | } |
| 411 | 411 | realmselect = realmselect + '</span></td>'; |
| 412 | 412 | } else { |
| 413 | - realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>; |
|
| 413 | + realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>; |
|
| 414 | 414 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 415 | 415 | realmselect = realmselect + realms[0] + '</span>'; |
| 416 | 416 | realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">'; |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | clear_sp_question(); |
| 463 | 463 | t = 1; |
| 464 | 464 | } |
| 465 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 465 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 466 | 466 | inProgress(1, comment); |
| 467 | 467 | /*waiting(comment);*/ |
| 468 | 468 | $.ajax({ |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | testSociopath('', answer); |
| 524 | 524 | }); |
| 525 | 525 | $('#realmtest').click(function(event){ |
| 526 | - var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>; |
|
| 526 | + var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>; |
|
| 527 | 527 | inProgress(1, comment); |
| 528 | 528 | $('#start_test_area').hide(); |
| 529 | 529 | if ($('#select_sp_area').is(':hidden')) { |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | reset_footer(); |
| 572 | 572 | testSociopath(realm, 0); |
| 573 | 573 | } else { |
| 574 | - var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>; |
|
| 575 | - result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occurred") . '"'; ?>; |
|
| 574 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 575 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occurred").'"'; ?>; |
|
| 576 | 576 | result = result + '</h3>' |
| 577 | 577 | if (r.length == 1) { |
| 578 | - result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>; |
|
| 578 | + result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>; |
|
| 579 | 579 | } else { |
| 580 | - result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>; |
|
| 580 | + result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>; |
|
| 581 | 581 | } |
| 582 | 582 | result = result + ': ' |
| 583 | 583 | for (var i=0; i < r.length; i++) { |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | result = result + r[i]; |
| 588 | 588 | } |
| 589 | 589 | result = result + '.<br>'; |
| 590 | - result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 590 | + result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 591 | 591 | result = result + '</div>'; |
| 592 | 592 | $('#after_stage_1').hide(); |
| 593 | 593 | $('#before_stage_1').show(); |
@@ -655,43 +655,43 @@ discard block |
||
| 655 | 655 | success:function(data) { |
| 656 | 656 | if (data.status === 1) { |
| 657 | 657 | var result = ''; |
| 658 | - var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>; |
|
| 658 | + var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>; |
|
| 659 | 659 | result = '<div class="padding">'; |
| 660 | 660 | if (type == 'idp_send') { |
| 661 | - result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 661 | + result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 662 | 662 | result = result + '<table>'; |
| 663 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 664 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 665 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 666 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 667 | - result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 668 | - result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>'; |
|
| 663 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 664 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 665 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 666 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 667 | + result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 668 | + result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>'; |
|
| 669 | 669 | if (data.tests_result == 1) { |
| 670 | - result = result + <?php echo '"' . _("failure") . '"'; ?>; |
|
| 670 | + result = result + <?php echo '"'._("failure").'"'; ?>; |
|
| 671 | 671 | } else { |
| 672 | - result = result + <?php echo '"' . _("success") . '"'; ?>; |
|
| 672 | + result = result + <?php echo '"'._("success").'"'; ?>; |
|
| 673 | 673 | } |
| 674 | 674 | result = result + '</td></tr>'; |
| 675 | - result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 676 | - result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' '; |
|
| 675 | + result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 676 | + result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' '; |
|
| 677 | 677 | if (data.emailsent == 1) { |
| 678 | - result = result + <?php echo '"' . _("send successfully") . '"'; ?>; |
|
| 678 | + result = result + <?php echo '"'._("send successfully").'"'; ?>; |
|
| 679 | 679 | } else { |
| 680 | - result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>; |
|
| 680 | + result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>; |
|
| 681 | 681 | } |
| 682 | 682 | result = result + '</td><td></td></tr>'; |
| 683 | 683 | } |
| 684 | 684 | if (type == 'sp_send') { |
| 685 | - result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 685 | + result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 686 | 686 | result = result + '<table>'; |
| 687 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 688 | - result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 689 | - result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 690 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 691 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 692 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 693 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 694 | - result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 687 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 688 | + result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 689 | + result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 690 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 691 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 692 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 693 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 694 | + result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 695 | 695 | } |
| 696 | 696 | result = result + '</div>'; |
| 697 | 697 | showInfo(result, title); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | $(this).removeClass('visible_row').addClass('hidden_row'); |
| 718 | 718 | } |
| 719 | 719 | }); |
| 720 | - $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>); |
|
| 720 | + $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>); |
|
| 721 | 721 | } else { |
| 722 | 722 | $('#admin_realm').removeClass('error_input'); |
| 723 | 723 | $('#admin_realm').attr('title', ''); |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | $(document).on('keyup change', '#email' , function() { |
| 728 | 728 | if ($(this).val().length == 0 || !isEmail($(this).val())) { |
| 729 | 729 | $('#email').addClass('error_input'); |
| 730 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 730 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 731 | 731 | } else { |
| 732 | 732 | $('#email').removeClass('error_input'); |
| 733 | 733 | $('#email').attr('title', ''); |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | if ($('#mac').val().length > 0) { |
| 741 | 741 | if ($('#mac').val().length != 17) { |
| 742 | 742 | $('#mac').addClass('error_input'); |
| 743 | - $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>); |
|
| 743 | + $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>); |
|
| 744 | 744 | } else { |
| 745 | 745 | $('#mac').removeClass('error_input'); |
| 746 | 746 | $('#mac').attr('title', ''); |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | if ($(this).attr('id') == 'email' && $(this).val().length > 0) { |
| 750 | 750 | if (!isEmail($(this).val())) { |
| 751 | 751 | $('#email').addClass('error_input'); |
| 752 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 752 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 753 | 753 | } else { |
| 754 | 754 | $('#email').removeClass('error_input'); |
| 755 | 755 | $('#email').attr('title', ''); |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | if ($(this).attr('id') == 'outer_id' && $(this).val().length > 0) { |
| 759 | 759 | if (!isEmail($(this).val(), true)) { |
| 760 | 760 | $('#outer_id').addClass('error_input'); |
| 761 | - $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>); |
|
| 761 | + $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>); |
|
| 762 | 762 | } else { |
| 763 | 763 | $('#outer_id').removeClass('error_input'); |
| 764 | 764 | $('#outer_id').attr('title', ''); |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) { |
| 768 | 768 | if (!isOperatorName($(this).val())) { |
| 769 | 769 | $('#opname').addClass('error_input'); |
| 770 | - $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>); |
|
| 770 | + $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>); |
|
| 771 | 771 | $('#spmanually').show(); |
| 772 | 772 | } else { |
| 773 | 773 | $('#opname').removeClass('error_input'); |
@@ -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 | $deco = new \web\lib\admin\PageDecoration(); |
| 25 | 25 | $validator = new \web\lib\common\InputValidation(); |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | <?php |
| 56 | 56 | foreach ($preflist as $method) { |
| 57 | 57 | $escapedMethod = $method->getIntegerRep(); |
| 58 | - echo "<th scope='col' style='min-width:200px'>" . $method->getPrintableRep() . "<br/> |
|
| 58 | + echo "<th scope='col' style='min-width:200px'>".$method->getPrintableRep()."<br/> |
|
| 59 | 59 | <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
| 60 | 60 | <input type='hidden' name='eaptype' value='$escapedMethod'> |
| 61 | - <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button> |
|
| 61 | + <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button> |
|
| 62 | 62 | </form></th>"; |
| 63 | 63 | } |
| 64 | 64 | ?> |
@@ -78,10 +78,10 @@ discard block |
||
| 78 | 78 | continue; |
| 79 | 79 | } |
| 80 | 80 | echo "<tr>"; |
| 81 | - echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/> |
|
| 81 | + echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/> |
|
| 82 | 82 | <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
| 83 | 83 | <input type='hidden' name='device' value='$index'> |
| 84 | - <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button> |
|
| 84 | + <button class='redirect' type='submit'>"._("Device-specific options...")."</button> |
|
| 85 | 85 | </form> |
| 86 | 86 | </td>"; |
| 87 | 87 | $defaultisset = FALSE; |
@@ -90,13 +90,13 @@ discard block |
||
| 90 | 90 | $display_footnote = FALSE; |
| 91 | 91 | $langObject = new \core\common\Language(); |
| 92 | 92 | $downloadform = "<span style='display:ruby;'>"; |
| 93 | - $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])]; /* eduroam */ |
|
| 93 | + $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])]; /* eduroam */ |
|
| 94 | 94 | if (sizeof($my_profile->getAttributes("media:openroaming")) > 0 && isset($factory->device->options['hs20']) && $factory->device->options['hs20'] == 1) { |
| 95 | 95 | $formDiffs["<input type='hidden' name='openroaming' value='1'/>"] = sprintf(_("%s + OpenRoaming<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name']); /* eduroam + OpenRoaming */ |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | foreach ($formDiffs as $inputField => $text) { |
| 99 | - $downloadform .= "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'> |
|
| 99 | + $downloadform .= "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'> |
|
| 100 | 100 | <input type='hidden' name='device' value='$index'/> |
| 101 | 101 | <input type='hidden' name='generatedfor' value='admin'/> |
| 102 | 102 | $inputField |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | $distinctFootnotes[$num_footnotes] = $oneFootnote; |
| 151 | 151 | } |
| 152 | 152 | $numberToDisplay = array_keys($distinctFootnotes, $oneFootnote); |
| 153 | - echo "(" . $numberToDisplay[0] . ")"; |
|
| 153 | + echo "(".$numberToDisplay[0].")"; |
|
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | echo "</td>"; |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | </table> |
| 180 | 180 | <?php |
| 181 | 181 | if (count($distinctFootnotes)) { |
| 182 | - echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>"; |
|
| 182 | + echo "<p><strong>"._("Footnotes:")."</strong></p><table>"; |
|
| 183 | 183 | foreach ($distinctFootnotes as $number => $text) { |
| 184 | 184 | echo "<tr><td>($number) - </td><td>$text</td></tr>"; |
| 185 | 185 | } |
