@@ -207,70 +207,70 @@ discard block |
||
| 207 | 207 | </div> |
| 208 | 208 | <?php |
| 209 | 209 | break; |
| 210 | - case "core\ProfileRADIUS": |
|
| 211 | - ?> |
|
| 212 | - <div style='padding-bottom:20px;'> |
|
| 210 | + case "core\ProfileRADIUS": |
|
| 211 | + ?> |
|
| 212 | + <div style='padding-bottom:20px;'> |
|
| 213 | 213 | <?php $profile_name = $profile_list->name; ?> |
| 214 | - <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2> |
|
| 214 | + <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2> |
|
| 215 | 215 | <?php |
| 216 | - // see if there are any profile-level overrides |
|
| 217 | - $attribs = $profile_list->getAttributes(); |
|
| 218 | - // write things into a buffer; we need some function calls to determine |
|
| 219 | - // readiness - but want to display it before! |
|
| 220 | - $has_overrides = FALSE; |
|
| 221 | - foreach ($attribs as $attrib) { |
|
| 222 | - if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) { |
|
| 223 | - $has_overrides = TRUE; |
|
| 216 | + // see if there are any profile-level overrides |
|
| 217 | + $attribs = $profile_list->getAttributes(); |
|
| 218 | + // write things into a buffer; we need some function calls to determine |
|
| 219 | + // readiness - but want to display it before! |
|
| 220 | + $has_overrides = FALSE; |
|
| 221 | + foreach ($attribs as $attrib) { |
|
| 222 | + if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) { |
|
| 223 | + $has_overrides = TRUE; |
|
| 224 | + } |
|
| 224 | 225 | } |
| 225 | - } |
|
| 226 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 227 | - $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
|
| 228 | - $allcomplete = TRUE; |
|
| 229 | - foreach ($typelist as $eaptype) { |
|
| 230 | - $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
|
| 231 | - $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
|
| 232 | - if ($completeness === true) { |
|
| 233 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 234 | - } else { |
|
| 235 | - $buffer_eaptypediv .= " <div class='notacceptable'>"; |
|
| 236 | - $buffer_eaptypediv .= _("Information needed!"); |
|
| 237 | - if (is_array($completeness)) { |
|
| 238 | - $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
|
| 239 | - foreach ($completeness as $missing_attrib) { |
|
| 240 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 226 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 227 | + $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
|
| 228 | + $allcomplete = TRUE; |
|
| 229 | + foreach ($typelist as $eaptype) { |
|
| 230 | + $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
|
| 231 | + $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
|
| 232 | + if ($completeness === true) { |
|
| 233 | + $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 234 | + } else { |
|
| 235 | + $buffer_eaptypediv .= " <div class='notacceptable'>"; |
|
| 236 | + $buffer_eaptypediv .= _("Information needed!"); |
|
| 237 | + if (is_array($completeness)) { |
|
| 238 | + $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
|
| 239 | + foreach ($completeness as $missing_attrib) { |
|
| 240 | + $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 241 | + } |
|
| 242 | + $buffer_eaptypediv .= "</ul>"; |
|
| 241 | 243 | } |
| 242 | - $buffer_eaptypediv .= "</ul>"; |
|
| 244 | + $buffer_eaptypediv .= "</div>"; |
|
| 245 | + $allcomplete = FALSE; |
|
| 243 | 246 | } |
| 244 | - $buffer_eaptypediv .= "</div>"; |
|
| 245 | - $allcomplete = FALSE; |
|
| 246 | - } |
|
| 247 | - $attribs = $profile_list->getAttributes(); |
|
| 248 | - $justOnce = FALSE; |
|
| 249 | - foreach ($attribs as $attrib) { |
|
| 250 | - if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
|
| 251 | - $justOnce = TRUE; |
|
| 252 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 247 | + $attribs = $profile_list->getAttributes(); |
|
| 248 | + $justOnce = FALSE; |
|
| 249 | + foreach ($attribs as $attrib) { |
|
| 250 | + if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
|
| 251 | + $justOnce = TRUE; |
|
| 252 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 253 | + } |
|
| 253 | 254 | } |
| 255 | + $buffer_eaptypediv .= "<br/>"; |
|
| 254 | 256 | } |
| 255 | - $buffer_eaptypediv .= "<br/>"; |
|
| 256 | - } |
|
| 257 | - $buffer_eaptypediv .= "</div>"; |
|
| 257 | + $buffer_eaptypediv .= "</div>"; |
|
| 258 | 258 | |
| 259 | - $buffer_headline = "<span style='float:right;'>"; |
|
| 260 | - $readiness = $profile_list->readinessLevel(); |
|
| 261 | - if ($has_overrides) { |
|
| 262 | - $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE); |
|
| 263 | - } |
|
| 264 | - if (!$allcomplete) { |
|
| 265 | - $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE); |
|
| 266 | - } |
|
| 267 | - switch ($readiness) { |
|
| 259 | + $buffer_headline = "<span style='float:right;'>"; |
|
| 260 | + $readiness = $profile_list->readinessLevel(); |
|
| 261 | + if ($has_overrides) { |
|
| 262 | + $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE); |
|
| 263 | + } |
|
| 264 | + if (!$allcomplete) { |
|
| 265 | + $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE); |
|
| 266 | + } |
|
| 267 | + switch ($readiness) { |
|
| 268 | 268 | case core\AbstractProfile::READINESS_LEVEL_SHOWTIME: |
| 269 | 269 | $buffer_headline .= $uiElements->boxOkay("", _("This profile is shown on the user download interface."), TRUE); |
| 270 | 270 | break; |
| 271 | 271 | case core\AbstractProfile::READINESS_LEVEL_SUFFICIENTCONFIG: |
| 272 | 272 | $buffer_headline .= $uiElements->boxWarning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), $uiElements->displayName("profile:production")), TRUE); |
| 273 | - } |
|
| 273 | + } |
|
| 274 | 274 | |
| 275 | 275 | $buffer_headline .= "</span></div>"; |
| 276 | 276 | |
@@ -353,8 +353,8 @@ discard block |
||
| 353 | 353 | </div> |
| 354 | 354 | <?php |
| 355 | 355 | break; |
| 356 | - default: |
|
| 357 | - throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!"); |
|
| 356 | + default: |
|
| 357 | + throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!"); |
|
| 358 | 358 | } |
| 359 | 359 | ?> |
| 360 | 360 | <!-- dummy width to keep a little distance --> |
@@ -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(); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | } else { |
| 39 | 39 | $link = 'http://'; |
| 40 | 40 | } |
| 41 | -$link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME']; |
|
| 41 | +$link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']; |
|
| 42 | 42 | $link = htmlspecialchars($link); |
| 43 | 43 | |
| 44 | 44 | echo $deco->defaultPagePrelude(sprintf(_("%s: %s Dashboard"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant)); |
@@ -182,14 +182,14 @@ discard block |
||
| 182 | 182 | <ul style='margin:1px'> |
| 183 | 183 | <?php |
| 184 | 184 | foreach ($completeness as $missing_attrib) { |
| 185 | - echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 185 | + echo "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 186 | 186 | } |
| 187 | 187 | ?> |
| 188 | 188 | </ul> |
| 189 | 189 | </div> |
| 190 | 190 | <?php |
| 191 | 191 | } else { |
| 192 | - echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $profile_list->realm); |
|
| 192 | + echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $profile_list->realm); |
|
| 193 | 193 | } |
| 194 | 194 | ?> |
| 195 | 195 | <br/> |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | if ($readonly === FALSE) { |
| 199 | 199 | ?> |
| 200 | 200 | <form action='edit_silverbullet.php?inst_id=<?php echo $my_inst->identifier; ?>&profile_id=<?php echo $profile_list->identifier; ?>' method='POST'> |
| 201 | - <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 201 | + <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 202 | 202 | </form> |
| 203 | 203 | <?php |
| 204 | 204 | } |
@@ -223,21 +223,21 @@ discard block |
||
| 223 | 223 | $has_overrides = TRUE; |
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 226 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>"; |
|
| 227 | 227 | $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
| 228 | 228 | $allcomplete = TRUE; |
| 229 | 229 | foreach ($typelist as $eaptype) { |
| 230 | 230 | $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
| 231 | 231 | $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
| 232 | 232 | if ($completeness === true) { |
| 233 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 233 | + $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>"; |
|
| 234 | 234 | } else { |
| 235 | 235 | $buffer_eaptypediv .= " <div class='notacceptable'>"; |
| 236 | 236 | $buffer_eaptypediv .= _("Information needed!"); |
| 237 | 237 | if (is_array($completeness)) { |
| 238 | 238 | $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
| 239 | 239 | foreach ($completeness as $missing_attrib) { |
| 240 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 240 | + $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 241 | 241 | } |
| 242 | 242 | $buffer_eaptypediv .= "</ul>"; |
| 243 | 243 | } |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | foreach ($attribs as $attrib) { |
| 250 | 250 | if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
| 251 | 251 | $justOnce = TRUE; |
| 252 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 252 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>"; |
|
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | $buffer_eaptypediv .= "<br/>"; |
@@ -287,10 +287,10 @@ discard block |
||
| 287 | 287 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
| 288 | 288 | $diagUrl = "../diag/"; |
| 289 | 289 | } else { |
| 290 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
| 290 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
| 291 | 291 | } |
| 292 | 292 | ?> |
| 293 | - <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $my_inst->identifier . "&profile_id=" . $profile_list->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 293 | + <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$my_inst->identifier."&profile_id=".$profile_list->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 294 | 294 | <input type='hidden' name='comefrom' id='comefrom-<?php echo $profilecount; ?>' value='<?php echo $link; ?>'/> |
| 295 | 295 | <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!"); ?>'> |
| 296 | 296 | <?php echo _("Check realm reachability"); ?> |
@@ -324,9 +324,9 @@ discard block |
||
| 324 | 324 | ?> |
| 325 | 325 | <div style='display: flex;'> |
| 326 | 326 | <?php |
| 327 | - $idpLevelUrl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier; |
|
| 328 | - $displayurl = $idpLevelUrl . "&profile=" . $profile_list->identifier; |
|
| 329 | - $QRurl = $idpLevelUrl . "&profile=" . $profile_list->identifier; |
|
| 327 | + $idpLevelUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$my_inst->identifier; |
|
| 328 | + $displayurl = $idpLevelUrl."&profile=".$profile_list->identifier; |
|
| 329 | + $QRurl = $idpLevelUrl."&profile=".$profile_list->identifier; |
|
| 330 | 330 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
| 331 | 331 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
| 332 | 332 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -338,9 +338,9 @@ discard block |
||
| 338 | 338 | if (empty($rawQr)) { |
| 339 | 339 | throw new Exception("Something went seriously wrong during QR code generation!"); |
| 340 | 340 | } |
| 341 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 341 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 342 | 342 | $size = getimagesize($uri); |
| 343 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
| 343 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
| 344 | 344 | |
| 345 | 345 | //echo "<nobr>$displayurl</nobr></a>"; |
| 346 | 346 | echo "<p>$displayurl</p></a>"; |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | <div> |
| 391 | 391 | <input type="hidden" name="consortium" value="eduroam"/> |
| 392 | 392 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
| 393 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 393 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 394 | 394 | </button> |
| 395 | 395 | |
| 396 | 396 | </div> |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | <?php |
| 417 | 417 | $hotspotProfiles = $my_inst->listDeployments(); |
| 418 | 418 | if (count($hotspotProfiles) == 0) { // no profiles yet. |
| 419 | - echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>"; |
|
| 419 | + echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>"; |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | foreach ($hotspotProfiles as $counter => $deploymentObject) { |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | <h2><?php |
| 438 | 438 | switch ($deploymentObject->consortium) { |
| 439 | 439 | case "eduroam": |
| 440 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME; |
|
| 440 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME; |
|
| 441 | 441 | break; |
| 442 | 442 | case "OpenRoaming": |
| 443 | 443 | $displayname = "OpenRoaming ANP"; |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | default: |
| 446 | 446 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
| 447 | 447 | } |
| 448 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
| 448 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
| 449 | 449 | ?></h2> |
| 450 | 450 | <table> |
| 451 | 451 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -459,13 +459,13 @@ discard block |
||
| 459 | 459 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
| 460 | 460 | <?php |
| 461 | 461 | if ($deploymentObject->host1_v4 !== NULL) { |
| 462 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
| 462 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
| 463 | 463 | } |
| 464 | 464 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
| 465 | 465 | echo "<br/>"; |
| 466 | 466 | } |
| 467 | 467 | if ($deploymentObject->host1_v6 !== NULL) { |
| 468 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
| 468 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
| 469 | 469 | } |
| 470 | 470 | ?> |
| 471 | 471 | </td> |
@@ -473,9 +473,9 @@ discard block |
||
| 473 | 473 | <td><?php echo $deploymentObject->port1; ?></td> |
| 474 | 474 | <td> |
| 475 | 475 | <?php |
| 476 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 477 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 478 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
| 476 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 477 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 478 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>"; |
|
| 479 | 479 | ?> |
| 480 | 480 | </td> |
| 481 | 481 | </tr> |
@@ -483,22 +483,22 @@ discard block |
||
| 483 | 483 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
| 484 | 484 | <?php |
| 485 | 485 | if ($deploymentObject->host2_v4 !== NULL) { |
| 486 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
| 486 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
| 487 | 487 | } |
| 488 | 488 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
| 489 | 489 | echo "<br/>"; |
| 490 | 490 | } |
| 491 | 491 | if ($deploymentObject->host2_v6 !== NULL) { |
| 492 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
| 492 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
| 493 | 493 | } |
| 494 | 494 | ?></td> |
| 495 | 495 | <td><?php echo _("RADIUS port number: ") ?></td> |
| 496 | 496 | <td><?php echo $deploymentObject->port2; ?></td> |
| 497 | 497 | <td> |
| 498 | 498 | <?php |
| 499 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 500 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 501 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
| 499 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 500 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 501 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>"; |
|
| 502 | 502 | ?> |
| 503 | 503 | </td> |
| 504 | 504 | </tr> |
@@ -550,12 +550,12 @@ discard block |
||
| 550 | 550 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
| 551 | 551 | echo '<br>'; |
| 552 | 552 | if ($res['FAILURE'] == 2) { |
| 553 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
| 553 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
| 554 | 554 | } else { |
| 555 | 555 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 556 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
| 556 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
| 557 | 557 | } else { |
| 558 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
| 558 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
| 559 | 559 | } |
| 560 | 560 | } |
| 561 | 561 | } |
@@ -575,12 +575,12 @@ discard block |
||
| 575 | 575 | if ($res['FAILURE'] > 0) { |
| 576 | 576 | echo '<br>'; |
| 577 | 577 | if ($res['FAILURE'] == 2) { |
| 578 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
| 578 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
| 579 | 579 | } else { |
| 580 | 580 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 581 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
| 581 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
| 582 | 582 | } else { |
| 583 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
| 583 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
| 584 | 584 | } |
| 585 | 585 | } |
| 586 | 586 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | && ( $_POST['consortium'] == "eduroam" |
| 41 | 41 | || |
| 42 | 42 | ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 ) |
| 43 | - ) |
|
| 43 | + ) |
|
| 44 | 44 | ) { |
| 45 | 45 | $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']); |
| 46 | 46 | header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
@@ -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(); |
@@ -37,13 +37,13 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | if (!isset($_GET['deployment_id'])) { |
| 39 | 39 | if (isset($_POST['consortium']) |
| 40 | - && ( $_POST['consortium'] == "eduroam" |
|
| 40 | + && ($_POST['consortium'] == "eduroam" |
|
| 41 | 41 | || |
| 42 | - ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 ) |
|
| 42 | + ($_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0) |
|
| 43 | 43 | ) |
| 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!"); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if (in_array('OK', $response)) { |
| 59 | 59 | $deployment->deactivate(); |
| 60 | 60 | } |
| 61 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 61 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 62 | 62 | exit(0); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | if (in_array('OK', $response)) { |
| 68 | 68 | $deployment->activate(); |
| 69 | 69 | } |
| 70 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 70 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 71 | 71 | exit(0); |
| 72 | 72 | } |
| 73 | 73 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | } else { |
| 90 | 90 | $response = ['NOOP', 'NOOP']; |
| 91 | 91 | } |
| 92 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 92 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 93 | 93 | exit(0); |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | echo $uiElements->instLevelInfoBoxes($my_inst); |
| 118 | 118 | $deploymentOptions = $deployment->getAttributes(); |
| 119 | 119 | 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'> |
| 120 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 120 | + <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 121 | 121 | $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE); |
| 122 | 122 | ?> |
| 123 | 123 | <fieldset class='option_container' id='managedsp_override'> |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | <!-- input for VLAN identifier for home users--> |
| 150 | 150 | <td> |
| 151 | 151 | <span id='vlan_label'> |
| 152 | -<?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?> |
|
| 152 | +<?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?> |
|
| 153 | 153 | </span> |
| 154 | 154 | </td> |
| 155 | 155 | <td> |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | </fieldset> |
| 170 | 170 | |
| 171 | 171 | <?php |
| 172 | - 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>"; |
|
| 172 | + 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>"; |
|
| 173 | 173 | echo $deco->footer(); |
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | \ No newline at end of file |