GEANT /
CAT
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | namespace core; |
| 23 | 23 | |
| 24 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 24 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 25 | 25 | |
| 26 | 26 | $instMgmt = new \core\UserManagement(); |
| 27 | 27 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?> |
| 62 | 62 | <tr> |
| 63 | 63 | <td> |
| 64 | - <?php echo "" . _("Unique Identifier") ?> |
|
| 64 | + <?php echo ""._("Unique Identifier") ?> |
|
| 65 | 65 | </td> |
| 66 | 66 | <td> |
| 67 | 67 | </td> |
@@ -74,14 +74,14 @@ discard block |
||
| 74 | 74 | <div> |
| 75 | 75 | <?php |
| 76 | 76 | if (\config\Master::DB['USER']['readonly'] === FALSE) { |
| 77 | - echo "<a href='edit_user.php'><button>" . _("Edit User Details") . "</button></a>"; |
|
| 77 | + echo "<a href='edit_user.php'><button>"._("Edit User Details")."</button></a>"; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | if ($user->isFederationAdmin()) { |
| 81 | - echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed) . "</button></form>"; |
|
| 81 | + echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>".sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed)."</button></form>"; |
|
| 82 | 82 | } |
| 83 | 83 | if ($user->isSuperadmin()) { |
| 84 | - echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to access the superadmin page') . "</button></form>"; |
|
| 84 | + echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>"._('Click here to access the superadmin page')."</button></form>"; |
|
| 85 | 85 | } |
| 86 | 86 | ?> |
| 87 | 87 | </div> |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") { |
| 95 | 95 | $target = "https://wiki.geant.org/x/6Zg7Bw"; // Managed IdP manual |
| 96 | 96 | } |
| 97 | - $helptext = "<h3 style='display:inline;'>" . sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureInst) . "</h3>"; |
|
| 97 | + $helptext = "<h3 style='display:inline;'>".sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureInst)."</h3>"; |
|
| 98 | 98 | } else { |
| 99 | 99 | $helptext = ""; |
| 100 | 100 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | // we need to run the Federation constructor |
| 104 | 104 | $cat = new \core\CAT; |
| 105 | 105 | /// first parameter: number of Identity Providers; second param is the literal configured term for 'Identity Provider' (you may or may not be able to add a plural suffix for your locale) |
| 106 | - echo "<h2>" . sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureParticipant) . "</h2>"; |
|
| 106 | + echo "<h2>".sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureParticipant)."</h2>"; |
|
| 107 | 107 | $instlist = []; |
| 108 | 108 | $my_idps = []; |
| 109 | 109 | $myFeds = []; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $coadmin = new \core\User($username['ID']); |
| 175 | 175 | $coadmin_name = $coadmin->getAttributes('user:realname'); |
| 176 | 176 | if (count($coadmin_name) > 0) { |
| 177 | - echo $coadmin_name[0]['value'] . "<br/>"; |
|
| 177 | + echo $coadmin_name[0]['value']."<br/>"; |
|
| 178 | 178 | unset($admins[$number]); |
| 179 | 179 | } |
| 180 | 180 | } else { // don't list self |
@@ -193,14 +193,14 @@ discard block |
||
| 193 | 193 | <td> |
| 194 | 194 | <?php |
| 195 | 195 | if ($blessedUser && \config\Master::DB['INST']['readonly'] === FALSE) { |
| 196 | - echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $the_inst->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>" . _("Add/Remove Administrators") . "</button></form></div>"; |
|
| 196 | + echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=".$the_inst->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>"._("Add/Remove Administrators")."</button></form></div>"; |
|
| 197 | 197 | } |
| 198 | 198 | ?> |
| 199 | 199 | </td> |
| 200 | 200 | <td> <!-- danger zone --> |
| 201 | 201 | |
| 202 | 202 | <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'> |
| 203 | - <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( \config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL ? sprintf(_("After deleting the %s, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed) . " " : "" ) . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclatureParticipant); ?></button> |
|
| 203 | + <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL ? sprintf(_("After deleting the %s, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed)." " : "").sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclatureParticipant); ?></button> |
|
| 204 | 204 | </form> |
| 205 | 205 | <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'> |
| 206 | 206 | <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART; ?>' onclick="return confirm('<?php echo sprintf(_("This action will delete all properties of the %s and start over the configuration from scratch. Do you really want to reset all settings of the %s %s?"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Reset all %s settings"), $uiElements->nomenclatureParticipant); ?></button> |
@@ -215,18 +215,18 @@ discard block |
||
| 215 | 215 | <?php |
| 216 | 216 | } |
| 217 | 217 | } else { |
| 218 | - echo "<h2>" . sprintf(_("You are not managing any %s."), $uiElements->nomenclatureInst) . "</h2>"; |
|
| 218 | + echo "<h2>".sprintf(_("You are not managing any %s."), $uiElements->nomenclatureInst)."</h2>"; |
|
| 219 | 219 | } |
| 220 | 220 | if (\config\Master::DB['INST']['readonly'] === FALSE) { |
| 221 | 221 | if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL) { |
| 222 | - echo "<p>" . sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant) . "</p>"; |
|
| 222 | + echo "<p>".sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant)."</p>"; |
|
| 223 | 223 | echo "<hr/> |
| 224 | 224 | <div style='white-space: nowrap;'> |
| 225 | 225 | <form action='action_enrollment.php' method='get' accept-charset='UTF-8'>" . |
| 226 | - sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant) . |
|
| 226 | + sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant). |
|
| 227 | 227 | " <input type='text' id='token' name='token'/> |
| 228 | 228 | <button type='submit'>" . |
| 229 | - _("Go!") . " |
|
| 229 | + _("Go!")." |
|
| 230 | 230 | </button> |
| 231 | 231 | </form> |
| 232 | 232 | </div>"; |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | <div style='white-space: nowrap;'> |
| 236 | 236 | <form action='action_enrollment.php' method='get'><button type='submit' accept-charset='UTF-8'> |
| 237 | 237 | <input type='hidden' id='token' name='token' value='SELF-REGISTER'/>" . |
| 238 | - sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant) . " |
|
| 238 | + sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant)." |
|
| 239 | 239 | </button> |
| 240 | 240 | </form> |
| 241 | 241 | </div>"; |
@@ -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)); |
@@ -165,14 +165,14 @@ discard block |
||
| 165 | 165 | <ul style='margin:1px'> |
| 166 | 166 | <?php |
| 167 | 167 | foreach ($completeness as $missing_attrib) { |
| 168 | - echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 168 | + echo "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 169 | 169 | } |
| 170 | 170 | ?> |
| 171 | 171 | </ul> |
| 172 | 172 | </div> |
| 173 | 173 | <?php |
| 174 | 174 | } else { |
| 175 | - 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); |
|
| 175 | + 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); |
|
| 176 | 176 | } |
| 177 | 177 | ?> |
| 178 | 178 | <br/> |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | if ($readonly === FALSE) { |
| 182 | 182 | ?> |
| 183 | 183 | <form action='edit_silverbullet.php?inst_id=<?php echo $my_inst->identifier; ?>&profile_id=<?php echo $profile_list->identifier; ?>' method='POST'> |
| 184 | - <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 184 | + <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 185 | 185 | </form> |
| 186 | 186 | <?php |
| 187 | 187 | } |
@@ -206,21 +206,21 @@ discard block |
||
| 206 | 206 | $has_overrides = TRUE; |
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 209 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>"; |
|
| 210 | 210 | $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
| 211 | 211 | $allcomplete = TRUE; |
| 212 | 212 | foreach ($typelist as $eaptype) { |
| 213 | 213 | $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
| 214 | 214 | $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
| 215 | 215 | if ($completeness === true) { |
| 216 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 216 | + $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>"; |
|
| 217 | 217 | } else { |
| 218 | 218 | $buffer_eaptypediv .= " <div class='notacceptable'>"; |
| 219 | 219 | $buffer_eaptypediv .= _("Information needed!"); |
| 220 | 220 | if (is_array($completeness)) { |
| 221 | 221 | $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
| 222 | 222 | foreach ($completeness as $missing_attrib) { |
| 223 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 223 | + $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 224 | 224 | } |
| 225 | 225 | $buffer_eaptypediv .= "</ul>"; |
| 226 | 226 | } |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | foreach ($attribs as $attrib) { |
| 233 | 233 | if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
| 234 | 234 | $justOnce = TRUE; |
| 235 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 235 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>"; |
|
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | $buffer_eaptypediv .= "<br/>"; |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
| 271 | 271 | $diagUrl = "../diag/"; |
| 272 | 272 | } else { |
| 273 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
| 273 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
| 274 | 274 | } |
| 275 | 275 | ?> |
| 276 | 276 | <form action='<?php echo $diagUrl; ?>action_realmcheck.php?inst_id=$my_inst->identifier&profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'> |
@@ -307,9 +307,9 @@ discard block |
||
| 307 | 307 | ?> |
| 308 | 308 | <div style='display: flex;'> |
| 309 | 309 | <?php |
| 310 | - $idpLevelUrl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier; |
|
| 311 | - $displayurl = $idpLevelUrl . "&profile=" . $profile_list->identifier; |
|
| 312 | - $QRurl = $idpLevelUrl . "&profile=" . $profile_list->identifier; |
|
| 310 | + $idpLevelUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$my_inst->identifier; |
|
| 311 | + $displayurl = $idpLevelUrl."&profile=".$profile_list->identifier; |
|
| 312 | + $QRurl = $idpLevelUrl."&profile=".$profile_list->identifier; |
|
| 313 | 313 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
| 314 | 314 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
| 315 | 315 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -321,9 +321,9 @@ discard block |
||
| 321 | 321 | if (empty($rawQr)) { |
| 322 | 322 | throw new Exception("Something went seriously wrong during QR code generation!"); |
| 323 | 323 | } |
| 324 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 324 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 325 | 325 | $size = getimagesize($uri); |
| 326 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
| 326 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
| 327 | 327 | |
| 328 | 328 | //echo "<nobr>$displayurl</nobr></a>"; |
| 329 | 329 | echo "<p>$displayurl</p></a>"; |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | <div> |
| 374 | 374 | <input type="hidden" name="consortium" value="eduroam"/> |
| 375 | 375 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
| 376 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 376 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 377 | 377 | </button> |
| 378 | 378 | |
| 379 | 379 | </div> |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | <?php |
| 400 | 400 | $hotspotProfiles = $my_inst->listDeployments(); |
| 401 | 401 | if (count($hotspotProfiles) == 0) { // no profiles yet. |
| 402 | - echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>"; |
|
| 402 | + echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>"; |
|
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | foreach ($hotspotProfiles as $counter => $deploymentObject) { |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | default: |
| 429 | 429 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
| 430 | 430 | } |
| 431 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2> |
|
| 431 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2> |
|
| 432 | 432 | <table> |
| 433 | 433 | <caption><?php echo _("Deployment Details"); ?></caption> |
| 434 | 434 | <tr> |
@@ -441,13 +441,13 @@ discard block |
||
| 441 | 441 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
| 442 | 442 | <?php |
| 443 | 443 | if ($deploymentObject->host1_v4 !== NULL) { |
| 444 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
| 444 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
| 445 | 445 | } |
| 446 | 446 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
| 447 | 447 | echo "<br/>"; |
| 448 | 448 | } |
| 449 | 449 | if ($deploymentObject->host1_v6 !== NULL) { |
| 450 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
| 450 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
| 451 | 451 | } |
| 452 | 452 | ?> |
| 453 | 453 | </td> |
@@ -455,9 +455,9 @@ discard block |
||
| 455 | 455 | <td><?php echo $deploymentObject->port1; ?></td> |
| 456 | 456 | <td> |
| 457 | 457 | <?php |
| 458 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 459 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 460 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
| 458 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 459 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 460 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>"; |
|
| 461 | 461 | ?> |
| 462 | 462 | </td> |
| 463 | 463 | </tr> |
@@ -465,22 +465,22 @@ discard block |
||
| 465 | 465 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
| 466 | 466 | <?php |
| 467 | 467 | if ($deploymentObject->host2_v4 !== NULL) { |
| 468 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
| 468 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
| 469 | 469 | } |
| 470 | 470 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
| 471 | 471 | echo "<br/>"; |
| 472 | 472 | } |
| 473 | 473 | if ($deploymentObject->host2_v6 !== NULL) { |
| 474 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
| 474 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
| 475 | 475 | } |
| 476 | 476 | ?></td> |
| 477 | 477 | <td><?php echo _("RADIUS port number: ") ?></td> |
| 478 | 478 | <td><?php echo $deploymentObject->port2; ?></td> |
| 479 | 479 | <td> |
| 480 | 480 | <?php |
| 481 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 482 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 483 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
| 481 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 482 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 483 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>"; |
|
| 484 | 484 | ?> |
| 485 | 485 | </td> |
| 486 | 486 | </tr> |
@@ -532,12 +532,12 @@ discard block |
||
| 532 | 532 | if (isset($res['FAILURE']) && $res['FAILURE'] > 0) { |
| 533 | 533 | echo '<br>'; |
| 534 | 534 | if ($res['FAILURE'] == 2) { |
| 535 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
| 535 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
| 536 | 536 | } else { |
| 537 | 537 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 538 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
| 538 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
| 539 | 539 | } else { |
| 540 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
| 540 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
| 541 | 541 | } |
| 542 | 542 | } |
| 543 | 543 | } |
@@ -557,12 +557,12 @@ discard block |
||
| 557 | 557 | if ($res['FAILURE'] > 0) { |
| 558 | 558 | echo '<br>'; |
| 559 | 559 | if ($res['FAILURE'] == 2) { |
| 560 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
| 560 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
| 561 | 561 | } else { |
| 562 | 562 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 563 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
| 563 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
| 564 | 564 | } else { |
| 565 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
| 565 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
| 566 | 566 | } |
| 567 | 567 | } |
| 568 | 568 | } |
@@ -190,71 +190,71 @@ discard block |
||
| 190 | 190 | </div> |
| 191 | 191 | <?php |
| 192 | 192 | break; |
| 193 | - case "core\ProfileRADIUS": |
|
| 194 | - ?> |
|
| 195 | - <div style='padding-bottom:20px;'> |
|
| 193 | + case "core\ProfileRADIUS": |
|
| 194 | + ?> |
|
| 195 | + <div style='padding-bottom:20px;'> |
|
| 196 | 196 | <?php |
| 197 | - $profile_name = $profile_list->name; ?> |
|
| 198 | - <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2> |
|
| 197 | + $profile_name = $profile_list->name; ?> |
|
| 198 | + <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2> |
|
| 199 | 199 | <?php |
| 200 | - // see if there are any profile-level overrides |
|
| 201 | - $attribs = $profile_list->getAttributes(); |
|
| 202 | - // write things into a buffer; we need some function calls to determine |
|
| 203 | - // readiness - but want to display it before! |
|
| 204 | - $has_overrides = FALSE; |
|
| 205 | - foreach ($attribs as $attrib) { |
|
| 206 | - if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) { |
|
| 207 | - $has_overrides = TRUE; |
|
| 200 | + // see if there are any profile-level overrides |
|
| 201 | + $attribs = $profile_list->getAttributes(); |
|
| 202 | + // write things into a buffer; we need some function calls to determine |
|
| 203 | + // readiness - but want to display it before! |
|
| 204 | + $has_overrides = FALSE; |
|
| 205 | + foreach ($attribs as $attrib) { |
|
| 206 | + if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) { |
|
| 207 | + $has_overrides = TRUE; |
|
| 208 | + } |
|
| 208 | 209 | } |
| 209 | - } |
|
| 210 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 211 | - $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
|
| 212 | - $allcomplete = TRUE; |
|
| 213 | - foreach ($typelist as $eaptype) { |
|
| 214 | - $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
|
| 215 | - $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
|
| 216 | - if ($completeness === true) { |
|
| 217 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 218 | - } else { |
|
| 219 | - $buffer_eaptypediv .= " <div class='notacceptable'>"; |
|
| 220 | - $buffer_eaptypediv .= _("Information needed!"); |
|
| 221 | - if (is_array($completeness)) { |
|
| 222 | - $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
|
| 223 | - foreach ($completeness as $missing_attrib) { |
|
| 224 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 210 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 211 | + $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
|
| 212 | + $allcomplete = TRUE; |
|
| 213 | + foreach ($typelist as $eaptype) { |
|
| 214 | + $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
|
| 215 | + $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
|
| 216 | + if ($completeness === true) { |
|
| 217 | + $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 218 | + } else { |
|
| 219 | + $buffer_eaptypediv .= " <div class='notacceptable'>"; |
|
| 220 | + $buffer_eaptypediv .= _("Information needed!"); |
|
| 221 | + if (is_array($completeness)) { |
|
| 222 | + $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
|
| 223 | + foreach ($completeness as $missing_attrib) { |
|
| 224 | + $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 225 | + } |
|
| 226 | + $buffer_eaptypediv .= "</ul>"; |
|
| 225 | 227 | } |
| 226 | - $buffer_eaptypediv .= "</ul>"; |
|
| 228 | + $buffer_eaptypediv .= "</div>"; |
|
| 229 | + $allcomplete = FALSE; |
|
| 227 | 230 | } |
| 228 | - $buffer_eaptypediv .= "</div>"; |
|
| 229 | - $allcomplete = FALSE; |
|
| 230 | - } |
|
| 231 | - $attribs = $profile_list->getAttributes(); |
|
| 232 | - $justOnce = FALSE; |
|
| 233 | - foreach ($attribs as $attrib) { |
|
| 234 | - if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
|
| 235 | - $justOnce = TRUE; |
|
| 236 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 231 | + $attribs = $profile_list->getAttributes(); |
|
| 232 | + $justOnce = FALSE; |
|
| 233 | + foreach ($attribs as $attrib) { |
|
| 234 | + if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
|
| 235 | + $justOnce = TRUE; |
|
| 236 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 237 | + } |
|
| 237 | 238 | } |
| 239 | + $buffer_eaptypediv .= "<br/>"; |
|
| 238 | 240 | } |
| 239 | - $buffer_eaptypediv .= "<br/>"; |
|
| 240 | - } |
|
| 241 | - $buffer_eaptypediv .= "</div>"; |
|
| 241 | + $buffer_eaptypediv .= "</div>"; |
|
| 242 | 242 | |
| 243 | - $buffer_headline = "<span style='float:right;'>"; |
|
| 244 | - $readiness = $profile_list->readinessLevel(); |
|
| 245 | - if ($has_overrides) { |
|
| 246 | - $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE); |
|
| 247 | - } |
|
| 248 | - if (!$allcomplete) { |
|
| 249 | - $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE); |
|
| 250 | - } |
|
| 251 | - switch ($readiness) { |
|
| 243 | + $buffer_headline = "<span style='float:right;'>"; |
|
| 244 | + $readiness = $profile_list->readinessLevel(); |
|
| 245 | + if ($has_overrides) { |
|
| 246 | + $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE); |
|
| 247 | + } |
|
| 248 | + if (!$allcomplete) { |
|
| 249 | + $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE); |
|
| 250 | + } |
|
| 251 | + switch ($readiness) { |
|
| 252 | 252 | case core\AbstractProfile::READINESS_LEVEL_SHOWTIME: |
| 253 | 253 | $buffer_headline .= $uiElements->boxOkay("", _("This profile is shown on the user download interface."), TRUE); |
| 254 | 254 | break; |
| 255 | 255 | case core\AbstractProfile::READINESS_LEVEL_SUFFICIENTCONFIG: |
| 256 | 256 | $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); |
| 257 | - } |
|
| 257 | + } |
|
| 258 | 258 | |
| 259 | 259 | $buffer_headline .= "</span></div>"; |
| 260 | 260 | |
@@ -337,8 +337,8 @@ discard block |
||
| 337 | 337 | </div> |
| 338 | 338 | <?php |
| 339 | 339 | break; |
| 340 | - default: |
|
| 341 | - throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!"); |
|
| 340 | + default: |
|
| 341 | + throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!"); |
|
| 342 | 342 | } |
| 343 | 343 | ?> |
| 344 | 344 | <!-- 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 | if (!isset($_GET['deployment_id'])) { |
| 39 | 39 | if (isset($_POST['consortium']) && count($myfed->getAttributes("fed:openroaming")) > 0) { |
| 40 | 40 | $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']); |
| 41 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 41 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 42 | 42 | exit(0); |
| 43 | 43 | } else { |
| 44 | 44 | throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!"); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if (in_array('OK', $response)) { |
| 54 | 54 | $deployment->deactivate(); |
| 55 | 55 | } |
| 56 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 56 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 57 | 57 | exit(0); |
| 58 | 58 | } |
| 59 | 59 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | if (in_array('OK', $response)) { |
| 63 | 63 | $deployment->activate(); |
| 64 | 64 | } |
| 65 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 65 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 66 | 66 | exit(0); |
| 67 | 67 | } |
| 68 | 68 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $deployment->status = core\DeploymentManaged::INACTIVE; |
| 84 | 84 | $response = $deployment->setRADIUSconfig(); |
| 85 | 85 | } |
| 86 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 86 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 87 | 87 | exit(0); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | echo $uiElements->instLevelInfoBoxes($my_inst); |
| 112 | 112 | $deploymentOptions = $deployment->getAttributes(); |
| 113 | 113 | 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'> |
| 114 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 114 | + <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 115 | 115 | $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE); |
| 116 | 116 | ?> |
| 117 | 117 | <fieldset class='option_container' id='managedsp_override'> |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | <!-- input for VLAN identifier for home users--> |
| 144 | 144 | <td> |
| 145 | 145 | <span id='vlan_label'> |
| 146 | -<?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?> |
|
| 146 | +<?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?> |
|
| 147 | 147 | </span> |
| 148 | 148 | </td> |
| 149 | 149 | <td> |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | </fieldset> |
| 164 | 164 | |
| 165 | 165 | <?php |
| 166 | - 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>"; |
|
| 166 | + 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>"; |
|
| 167 | 167 | echo $deco->footer(); |
| 168 | 168 | |
| 169 | 169 | |
| 170 | 170 | \ No newline at end of file |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id; |
| 271 | 271 | } |
| 272 | 272 | if ($clients > $maxSupportedClients * 0.9) { |
| 273 | - $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!"); |
|
| 273 | + $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!"); |
|
| 274 | 274 | } |
| 275 | 275 | } |
| 276 | 276 | if (count($serverCandidates) == 0 && $federation != "DEFAULT") { |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | return $this->findGoodServerLocation($adminLocation, "DEFAULT", $blacklistedServers); |
| 280 | 280 | } |
| 281 | 281 | if (count($serverCandidates) == 0) { |
| 282 | - throw new Exception("No available server found for new SP! $federation " . /** @scrutinizer ignore-type */ print_r($serverCandidates, true)); |
|
| 282 | + throw new Exception("No available server found for new SP! $federation "./** @scrutinizer ignore-type */ print_r($serverCandidates, true)); |
|
| 283 | 283 | } |
| 284 | 284 | // put the nearest server on top of the list |
| 285 | 285 | ksort($serverCandidates); |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | $foundFreePort1 = 0; |
| 308 | 308 | while ($foundFreePort1 == 0) { |
| 309 | 309 | $portCandidate = random_int(1200, 65535); |
| 310 | - $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '" . $ourserver . "' AND port_instance_1 = $portCandidate"); |
|
| 310 | + $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '".$ourserver."' AND port_instance_1 = $portCandidate"); |
|
| 311 | 311 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) { |
| 312 | 312 | $foundFreePort1 = $portCandidate; |
| 313 | 313 | } |
@@ -316,14 +316,14 @@ discard block |
||
| 316 | 316 | $foundFreePort2 = 0; |
| 317 | 317 | while ($foundFreePort2 == 0) { |
| 318 | 318 | $portCandidate = random_int(1200, 65535); |
| 319 | - $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '" . $ourSecondServer . "' AND port_instance_2 = $portCandidate"); |
|
| 319 | + $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '".$ourSecondServer."' AND port_instance_2 = $portCandidate"); |
|
| 320 | 320 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) { |
| 321 | 321 | $foundFreePort2 = $portCandidate; |
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | // and make up a shared secret that is halfways readable |
| 325 | 325 | $futureSecret = $this->randomString(16, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); |
| 326 | - $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '" . $ourserver . "', radius_instance_2 = '" . $ourSecondServer . "', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret', consortium = '$this->consortium' WHERE deployment_id = $this->identifier"); |
|
| 326 | + $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '".$ourserver."', radius_instance_2 = '".$ourSecondServer."', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret', consortium = '$this->consortium' WHERE deployment_id = $this->identifier"); |
|
| 327 | 327 | return ["port_instance_1" => $foundFreePort1, "port_instance_2" => $foundFreePort2, "secret" => $futureSecret, "radius_instance_1" => $ourserver, "radius_instance_2" => $ourserver]; |
| 328 | 328 | } |
| 329 | 329 | |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | */ |
| 371 | 371 | public function deactivate() |
| 372 | 372 | { |
| 373 | - $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::INACTIVE . " WHERE deployment_id = $this->identifier"); |
|
| 373 | + $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::INACTIVE." WHERE deployment_id = $this->identifier"); |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | /** |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | */ |
| 382 | 382 | public function activate() |
| 383 | 383 | { |
| 384 | - $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::ACTIVE . " WHERE deployment_id = $this->identifier"); |
|
| 384 | + $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::ACTIVE." WHERE deployment_id = $this->identifier"); |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | /** |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | { |
| 394 | 394 | $customAttrib = $this->getAttributes("managedsp:operatorname"); |
| 395 | 395 | if (count($customAttrib) == 0) { |
| 396 | - return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
| 396 | + return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
| 397 | 397 | } |
| 398 | 398 | return $customAttrib[0]["value"]; |
| 399 | 399 | } |
@@ -409,13 +409,13 @@ discard block |
||
| 409 | 409 | { |
| 410 | 410 | |
| 411 | 411 | $hostname = "radius_hostname_$idx"; |
| 412 | - $ch = curl_init("http://" . $this->$hostname); |
|
| 412 | + $ch = curl_init("http://".$this->$hostname); |
|
| 413 | 413 | if ($ch === FALSE) { |
| 414 | 414 | $res = 'FAILURE'; |
| 415 | 415 | } else { |
| 416 | 416 | curl_setopt($ch, CURLOPT_POST, 1); |
| 417 | 417 | curl_setopt($ch, CURLOPT_POSTFIELDS, $post); |
| 418 | - $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $post\n"); |
|
| 418 | + $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $post\n"); |
|
| 419 | 419 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); |
| 420 | 420 | curl_setopt($ch, CURLOPT_HEADER, 0); |
| 421 | 421 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | $this->loggerInstance->debug(1, $this); |
| 432 | 432 | } |
| 433 | 433 | $this->loggerInstance->debug(1, "Database update"); |
| 434 | - $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = " . ($res == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE) . " WHERE deployment_id = $this->identifier"); |
|
| 434 | + $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = ".($res == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE)." WHERE deployment_id = $this->identifier"); |
|
| 435 | 435 | return $res; |
| 436 | 436 | } |
| 437 | 437 | |
@@ -452,19 +452,19 @@ discard block |
||
| 452 | 452 | } else { |
| 453 | 453 | $txt = $remove ? _('Profile dectivation failed') : _('Profile activation/modification failed'); |
| 454 | 454 | } |
| 455 | - $txt = $txt . ' '; |
|
| 455 | + $txt = $txt.' '; |
|
| 456 | 456 | if (array_count_values($response)[$status] == 2) { |
| 457 | - $txt = $txt . _('on both RADIUS servers: primary and backup') . '.'; |
|
| 457 | + $txt = $txt._('on both RADIUS servers: primary and backup').'.'; |
|
| 458 | 458 | } else { |
| 459 | 459 | if ($response['res[1]'] == $status) { |
| 460 | - $txt = $txt . _('on primary RADIUS server') . '.'; |
|
| 460 | + $txt = $txt._('on primary RADIUS server').'.'; |
|
| 461 | 461 | } else { |
| 462 | - $txt = $txt . _('on backup RADIUS server') . '.'; |
|
| 462 | + $txt = $txt._('on backup RADIUS server').'.'; |
|
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | 465 | $mail = \core\common\OutsideComm::mailHandle(); |
| 466 | 466 | $email = $this->getAttributes("support:email")[0]['value']; |
| 467 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System"; |
|
| 467 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System"; |
|
| 468 | 468 | $mail->addAddress($email); |
| 469 | 469 | if ($status == 'OK') { |
| 470 | 470 | $mail->Subject = _('RADIUS profile update problem fixed'); |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | return NULL; |
| 499 | 499 | } |
| 500 | 500 | $timeout = 10; |
| 501 | - curl_setopt($ch, CURLOPT_URL, 'http://' . $host); |
|
| 501 | + curl_setopt($ch, CURLOPT_URL, 'http://'.$host); |
|
| 502 | 502 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
| 503 | 503 | curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
| 504 | 504 | curl_exec($ch); |
@@ -590,35 +590,35 @@ discard block |
||
| 590 | 590 | { |
| 591 | 591 | $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1; |
| 592 | 592 | $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => '')); |
| 593 | - $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&'; |
|
| 593 | + $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&'; |
|
| 594 | 594 | if ($remove) { |
| 595 | - $toPostTemplate = $toPostTemplate . 'remove=1&'; |
|
| 595 | + $toPostTemplate = $toPostTemplate.'remove=1&'; |
|
| 596 | 596 | } else { |
| 597 | 597 | if ($this->getAttributes("managedsp:operatorname")[0]['value'] ?? NULL) { |
| 598 | - $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getAttributes("managedsp:operatorname")[0]['value'] . '&'; |
|
| 598 | + $toPostTemplate = $toPostTemplate.'operatorname='.$this->getAttributes("managedsp:operatorname")[0]['value'].'&'; |
|
| 599 | 599 | } |
| 600 | 600 | if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) { |
| 601 | 601 | $allRealms = $this->getAllRealms(); |
| 602 | 602 | if (!empty($allRealms)) { |
| 603 | - $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&'; |
|
| 604 | - $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&'; |
|
| 603 | + $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&'; |
|
| 604 | + $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&'; |
|
| 605 | 605 | } |
| 606 | 606 | } |
| 607 | 607 | } |
| 608 | 608 | foreach (array_keys($toPost) as $key) { |
| 609 | - $elem = 'port' . $key; |
|
| 610 | - $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem; |
|
| 609 | + $elem = 'port'.$key; |
|
| 610 | + $toPost[$key] = $toPostTemplate.'port='.$this->$elem; |
|
| 611 | 611 | } |
| 612 | 612 | $response = array(); |
| 613 | 613 | foreach ($toPost as $key => $value) { |
| 614 | - $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n"); |
|
| 615 | - $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 614 | + $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n"); |
|
| 615 | + $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]); |
|
| 616 | 616 | } |
| 617 | 617 | if ($onlyone) { |
| 618 | - $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK; |
|
| 618 | + $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK; |
|
| 619 | 619 | } |
| 620 | 620 | foreach (array('OK', 'FAILURE') as $status) { |
| 621 | - if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) { |
|
| 621 | + if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) { |
|
| 622 | 622 | $this->sendMailtoAdmin($remove, $response, $status); |
| 623 | 623 | } |
| 624 | 624 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $optionClass = \core\Options::instance(); |
| 102 | 102 | $optionProps = $optionClass->optionType($optiontype); |
| 103 | 103 | $allowedValues = explode(',', substr($optionProps["flags"], 7)); |
| 104 | - if (in_array($incomingBinary,$allowedValues)) { |
|
| 104 | + if (in_array($incomingBinary, $allowedValues)) { |
|
| 105 | 105 | return TRUE; |
| 106 | 106 | } |
| 107 | 107 | return FALSE; |
@@ -346,14 +346,14 @@ discard block |
||
| 346 | 346 | case \core\Options::TYPECODE_TEXT: |
| 347 | 347 | case \core\Options::TYPECODE_COORDINATES: |
| 348 | 348 | case \core\Options::TYPECODE_INTEGER: |
| 349 | - $varName = $listOfEntries["$objId-" . self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']]; |
|
| 349 | + $varName = $listOfEntries["$objId-".self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']]; |
|
| 350 | 350 | if (!empty($varName)) { |
| 351 | 351 | $content = call_user_func_array([$this->validator, self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['function']], array_merge([$varName], self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['extraarg'])); |
| 352 | 352 | break; |
| 353 | 353 | } |
| 354 | 354 | continue 2; |
| 355 | 355 | case \core\Options::TYPECODE_BOOLEAN: |
| 356 | - $varName = $listOfEntries["$objId-" . \core\Options::TYPECODE_BOOLEAN]; |
|
| 356 | + $varName = $listOfEntries["$objId-".\core\Options::TYPECODE_BOOLEAN]; |
|
| 357 | 357 | if (!empty($varName)) { |
| 358 | 358 | $contentValid = $this->validator->boolean($varName); |
| 359 | 359 | if ($contentValid) { |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | } |
| 367 | 367 | continue 2; |
| 368 | 368 | case \core\Options::TYPECODE_STRING: |
| 369 | - $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]; |
|
| 369 | + $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING]; |
|
| 370 | 370 | if (!empty($previsionalContent)) { |
| 371 | 371 | $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad); |
| 372 | 372 | if ($content === FALSE) { |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | continue 2; |
| 378 | 378 | |
| 379 | 379 | case \core\Options::TYPECODE_ENUM_OPENROAMING: |
| 380 | - $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_ENUM_OPENROAMING]; |
|
| 380 | + $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_ENUM_OPENROAMING]; |
|
| 381 | 381 | if (!empty($previsionalContent)) { |
| 382 | 382 | $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad); |
| 383 | 383 | if ($content === FALSE) { |
@@ -388,15 +388,15 @@ discard block |
||
| 388 | 388 | continue 2; |
| 389 | 389 | case \core\Options::TYPECODE_FILE: |
| 390 | 390 | // this is either actually an uploaded file, or a reference to a DB entry of a previously uploaded file |
| 391 | - $reference = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]; |
|
| 391 | + $reference = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING]; |
|
| 392 | 392 | if (!empty($reference)) { // was already in, by ROWID reference, extract |
| 393 | 393 | // ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace) |
| 394 | 394 | $content = $this->validator->string(urldecode($reference), TRUE); |
| 395 | 395 | break; |
| 396 | 396 | } |
| 397 | - $fileName = $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] ?? ""; |
|
| 397 | + $fileName = $listOfEntries["$objId-".\core\Options::TYPECODE_FILE] ?? ""; |
|
| 398 | 398 | if ($fileName != "") { // let's do the download |
| 399 | - $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $fileName); |
|
| 399 | + $rawContent = \core\common\OutsideComm::downloadFile("file:///".$fileName); |
|
| 400 | 400 | |
| 401 | 401 | if ($rawContent === FALSE || !$this->checkUploadSanity($objValue, $rawContent)) { |
| 402 | 402 | $bad[] = $objValue; |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | } |
| 408 | 408 | continue 2; |
| 409 | 409 | default: |
| 410 | - throw new Exception("Internal Error: Unknown option type " . $objValue . "!"); |
|
| 410 | + throw new Exception("Internal Error: Unknown option type ".$objValue."!"); |
|
| 411 | 411 | } |
| 412 | 412 | // lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that. |
| 413 | 413 | $retval[] = ["$objValue" => ["lang" => $languageFlag, "content" => $content]]; |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | \core\Options::TYPECODE_BOOLEAN => ["html" => "input type='checkbox'", "tail" => ''], |
| 93 | 93 | \core\Options::TYPECODE_INTEGER => ["html" => "input type='number'", "tail" => ''], |
| 94 | 94 | \core\Options::TYPECODE_STRING => ["html" => "input type='string'", "tail" => ''], |
| 95 | - \core\Options::TYPECODE_ENUM_OPENROAMING => ["html" => "select", "tail" => "><option value='ask'>" . $this->enumPrettyPrints["ask"] . "</option><option value='always'>" . $this->enumPrettyPrints["always"] . "</option></select"], |
|
| 95 | + \core\Options::TYPECODE_ENUM_OPENROAMING => ["html" => "select", "tail" => "><option value='ask'>".$this->enumPrettyPrints["ask"]."</option><option value='always'>".$this->enumPrettyPrints["always"]."</option></select"], |
|
| 96 | 96 | \core\Options::TYPECODE_TEXT => ["html" => "textarea cols='30' rows='3'", "tail" => '></textarea'], |
| 97 | 97 | ]; |
| 98 | 98 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | */ |
| 107 | 107 | public function prefilledOptionTable(string $attributePrefix, $fed) |
| 108 | 108 | { |
| 109 | - $retval = "<table id='expandable_$attributePrefix" . "_options'>"; |
|
| 109 | + $retval = "<table id='expandable_$attributePrefix"."_options'>"; |
|
| 110 | 110 | |
| 111 | 111 | $prepopulate = []; |
| 112 | 112 | foreach ($this->listOfOptions as $existingAttribute) { |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $prepopulate[] = $existingAttribute; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | - if (is_array($prepopulate) && ( count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific" )) { // editing... fill with values |
|
| 117 | + if (is_array($prepopulate) && (count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific")) { // editing... fill with values |
|
| 118 | 118 | $retval .= $this->addOptionEdit($attributePrefix, $prepopulate); |
| 119 | 119 | } else { |
| 120 | 120 | $retval .= $this->addOptionNew($attributePrefix, $fed); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $optiontypearray = $optioninfo->optionType($option['name']); |
| 148 | 148 | $loggerInstance = new \core\common\Logging(); |
| 149 | 149 | $loggerInstance->debug(5, "About to execute optiontext with PREFILL!\n"); |
| 150 | - $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-' . $option['level'] . '-' . $option['row'] : $option['value']), $option['lang']); |
|
| 150 | + $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-'.$option['level'].'-'.$option['row'] : $option['value']), $option['lang']); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | return $retval; |
@@ -246,18 +246,18 @@ discard block |
||
| 246 | 246 | } |
| 247 | 247 | $descriptions["media:force_proxy"] = sprintf(_("The format of this option is: IPv4|IPv6|hostname:port . Forcing your users through a content filter of your own is a significant invasion of user self-determination. It also has technical issues. Please throughly read the discussion at %s before specifying a proxy with this option. This feature is currently experimental and only has an effect in Apple installers."), "https://github.com/GEANT/CAT/issues/96"); |
| 248 | 248 | $descriptions["managedsp:realmforvlan"] = sprintf(_("If you are also using %s, then your own realm is automatically tagged with the VLAN you choose, there is no need to add it here manually."), \core\ProfileSilverbullet::PRODUCTNAME); |
| 249 | - $descriptions["media:openroaming"] = sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."), "eduroam Ecosystem Broker OpenRoaming Identity Provider Policy") . |
|
| 250 | - " " . |
|
| 251 | - sprintf(_("Note that your requirement to inform users about the OpenRoaming End User Terms and Conditions is fulfilled when directing your end users to the %s download portal for installer download. Any other means of providing the installers needs to present this information via its own channel."), \config\Master::APPEARANCE['productname']) . |
|
| 252 | - " " . |
|
| 253 | - _("You are also aware that for best technical interoperability, you need to add a DNS entry into the DNS zone of your RADIUS realm.") . |
|
| 254 | - " " . |
|
| 249 | + $descriptions["media:openroaming"] = sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."), "eduroam Ecosystem Broker OpenRoaming Identity Provider Policy"). |
|
| 250 | + " ". |
|
| 251 | + sprintf(_("Note that your requirement to inform users about the OpenRoaming End User Terms and Conditions is fulfilled when directing your end users to the %s download portal for installer download. Any other means of providing the installers needs to present this information via its own channel."), \config\Master::APPEARANCE['productname']). |
|
| 252 | + " ". |
|
| 253 | + _("You are also aware that for best technical interoperability, you need to add a DNS entry into the DNS zone of your RADIUS realm."). |
|
| 254 | + " ". |
|
| 255 | 255 | _("Read the instructions in the wiki."); |
| 256 | 256 | \core\common\Entity::outOfThePotatoes(); |
| 257 | 257 | if (!isset($descriptions[$input])) { |
| 258 | 258 | return ""; |
| 259 | 259 | } |
| 260 | - return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:" . ($isVisible ? "block" : "none") . "' onclick='alert(\"" . $descriptions[$input] . "\")'><img src='../resources/images/icons/question-mark-icon.png" . "'></span>"; |
|
| 260 | + return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:".($isVisible ? "block" : "none")."' onclick='alert(\"".$descriptions[$input]."\")'><img src='../resources/images/icons/question-mark-icon.png"."'></span>"; |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | /** |
@@ -271,19 +271,19 @@ discard block |
||
| 271 | 271 | private function selectElement($rowid, $list) |
| 272 | 272 | { |
| 273 | 273 | $jsmagic = "onchange=' |
| 274 | - if (/#ML#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) { |
|
| 274 | + if (/#ML#/.test(document.getElementById(\"option-S" . $rowid."-select\").value)) { |
|
| 275 | 275 | document.getElementById(\"S$rowid-input-langselect\").style.display = \"block\"; |
| 276 | 276 | } else { |
| 277 | 277 | document.getElementById(\"S$rowid-input-langselect\").style.display = \"none\"; |
| 278 | 278 | }"; |
| 279 | 279 | foreach (array_keys($this->htmlDatatypeTexts) as $key) { |
| 280 | - $jsmagic .= "if (/#" . $key . "#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) { |
|
| 281 | - document.getElementById(\"S$rowid-input-file\").style.display = \"" . ($key == \core\Options::TYPECODE_FILE ? "block" : "none") . "\"; |
|
| 282 | - document.getElementById(\"S$rowid-input-text\").style.display = \"" . ($key == \core\Options::TYPECODE_TEXT ? "block" : "none") . "\"; |
|
| 283 | - document.getElementById(\"S$rowid-input-string\").style.display = \"" . ($key == \core\Options::TYPECODE_STRING ? "block" : "none") . "\"; |
|
| 284 | - document.getElementById(\"S$rowid-input-enum_openroaming\").style.display = \"" . ($key == \core\Options::TYPECODE_ENUM_OPENROAMING ? "block" : "none") . "\"; |
|
| 285 | - document.getElementById(\"S$rowid-input-boolean\").style.display = \"" . ($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none") . "\"; |
|
| 286 | - document.getElementById(\"S$rowid-input-integer\").style.display = \"" . ($key == \core\Options::TYPECODE_INTEGER ? "block" : "none") . "\"; |
|
| 280 | + $jsmagic .= "if (/#".$key."#/.test(document.getElementById(\"option-S".$rowid."-select\").value)) { |
|
| 281 | + document.getElementById(\"S$rowid-input-file\").style.display = \"".($key == \core\Options::TYPECODE_FILE ? "block" : "none")."\"; |
|
| 282 | + document.getElementById(\"S$rowid-input-text\").style.display = \"".($key == \core\Options::TYPECODE_TEXT ? "block" : "none")."\"; |
|
| 283 | + document.getElementById(\"S$rowid-input-string\").style.display = \"".($key == \core\Options::TYPECODE_STRING ? "block" : "none")."\"; |
|
| 284 | + document.getElementById(\"S$rowid-input-enum_openroaming\").style.display = \"".($key == \core\Options::TYPECODE_ENUM_OPENROAMING ? "block" : "none")."\"; |
|
| 285 | + document.getElementById(\"S$rowid-input-boolean\").style.display = \"".($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none")."\"; |
|
| 286 | + document.getElementById(\"S$rowid-input-integer\").style.display = \"".($key == \core\Options::TYPECODE_INTEGER ? "block" : "none")."\"; |
|
| 287 | 287 | } |
| 288 | 288 | "; |
| 289 | 289 | // hide all tooltips (each is a <span>, and there are no other <span>s) |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | $value = array_shift($list); |
| 315 | 315 | $listtype = $optioninfo->optionType($value); |
| 316 | 316 | $retval .= $uiElements->displayName($value); |
| 317 | - $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#'/>"; |
|
| 317 | + $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#".$listtype["type"]."#".$listtype["flag"]."#'/>"; |
|
| 318 | 318 | $activelisttype = $listtype; |
| 319 | 319 | $tooltips = $this->tooltip($rowid, $value, TRUE); |
| 320 | 320 | break; |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | $retval .= "<select id='option-S$rowid-select' name='option[S$rowid]' $jsmagic>"; |
| 323 | 323 | foreach ($list as $value) { |
| 324 | 324 | $listtype = $optioninfo->optionType($value); |
| 325 | - $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' "; |
|
| 325 | + $retval .= "<option id='option-S$rowid-v-$value' value='$value#".$listtype["type"]."#".$listtype["flag"]."#' "; |
|
| 326 | 326 | if ($iterator == $this->optionIterator) { |
| 327 | 327 | $retval .= "selected='selected'"; |
| 328 | 328 | $activelisttype = $listtype; |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | } else { |
| 331 | 331 | $tooltips .= $this->tooltip($rowid, $value, FALSE); |
| 332 | 332 | } |
| 333 | - $retval .= ">" . $uiElements->displayName($value) . "</option>"; |
|
| 333 | + $retval .= ">".$uiElements->displayName($value)."</option>"; |
|
| 334 | 334 | $iterator++; |
| 335 | 335 | } |
| 336 | 336 | |
@@ -356,9 +356,9 @@ discard block |
||
| 356 | 356 | private function selectLanguage($rowid, $makeVisible) |
| 357 | 357 | { |
| 358 | 358 | \core\common\Entity::intoThePotatoes(); |
| 359 | - $retval = "<select style='display:" . ($makeVisible ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'> |
|
| 360 | - <option value='' name='select_language' selected>" . _("select language") . "</option> |
|
| 361 | - <option value='C' name='all_languages'>" . _("default/other languages") . "</option>"; |
|
| 359 | + $retval = "<select style='display:".($makeVisible ? "block" : "none")."' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect'> |
|
| 360 | + <option value='' name='select_language' selected>" . _("select language")."</option> |
|
| 361 | + <option value='C' name='all_languages'>" . _("default/other languages")."</option>"; |
|
| 362 | 362 | foreach (\config\Master::LANGUAGES as $langindex => $possibleLang) { |
| 363 | 363 | $thislang = $possibleLang['display']; |
| 364 | 364 | $retval .= "<option value='$langindex' name='$langindex'>$thislang</option>"; |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | { |
| 380 | 380 | $retval = ""; |
| 381 | 381 | foreach ($this->htmlDatatypeTexts as $key => $type) { |
| 382 | - $retval .= "<" . $type['html'] . " style='display:" . ($activetype['type'] == $key ? "block" : "none") . "' name='value[S$rowid-$key]' id='S" . $rowid . "-input-" . $key . "'" . $type['tail'] . ">"; |
|
| 382 | + $retval .= "<".$type['html']." style='display:".($activetype['type'] == $key ? "block" : "none")."' name='value[S$rowid-$key]' id='S".$rowid."-input-".$key."'".$type['tail'].">"; |
|
| 383 | 383 | } |
| 384 | 384 | return $retval; |
| 385 | 385 | } |
@@ -395,11 +395,11 @@ discard block |
||
| 395 | 395 | { |
| 396 | 396 | // first column: the <select> element with the names of options and their field-toggling JS magic |
| 397 | 397 | $selectorInfo = $this->selectElement($rowid, $list); |
| 398 | - $retval = "<td>" . $selectorInfo["TEXT"] . "</td>"; |
|
| 398 | + $retval = "<td>".$selectorInfo["TEXT"]."</td>"; |
|
| 399 | 399 | // second column: the <select> element for language selection - only visible if the active option is multi-lang |
| 400 | - $retval .= "<td>" . $this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML") . "</td>"; |
|
| 400 | + $retval .= "<td>".$this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML")."</td>"; |
|
| 401 | 401 | // third column: the actual input fields; the data type of the active option is visible, all others hidden |
| 402 | - $retval .= "<td>" . $this->inputFields($rowid, $selectorInfo['ACTIVE']) . "</td>"; |
|
| 402 | + $retval .= "<td>".$this->inputFields($rowid, $selectorInfo['ACTIVE'])."</td>"; |
|
| 403 | 403 | return $retval; |
| 404 | 404 | } |
| 405 | 405 | |
@@ -423,20 +423,20 @@ discard block |
||
| 423 | 423 | $retval .= "<td>"; |
| 424 | 424 | $uiElements = new UIElements(); |
| 425 | 425 | $listtype = $optioninfo->optionType($optionName); |
| 426 | - $retval .= "<span style='display:flex;'>" . $uiElements->displayName($optionName); |
|
| 427 | - $retval .= $this->tooltip($rowid, $optionName, TRUE) . "</span>"; |
|
| 428 | - $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ></td>"; |
|
| 426 | + $retval .= "<span style='display:flex;'>".$uiElements->displayName($optionName); |
|
| 427 | + $retval .= $this->tooltip($rowid, $optionName, TRUE)."</span>"; |
|
| 428 | + $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#".$listtype["type"]."#".$listtype["flag"]."#' ></td>"; |
|
| 429 | 429 | |
| 430 | 430 | // language tag if any |
| 431 | 431 | $retval .= "<td>"; |
| 432 | 432 | if ($listtype["flag"] == "ML") { |
| 433 | 433 | |
| 434 | - $language = "(" . strtoupper($optionLang) . ")"; |
|
| 434 | + $language = "(".strtoupper($optionLang).")"; |
|
| 435 | 435 | if ($optionLang == 'C') { |
| 436 | 436 | $language = _("(default/other languages)"); |
| 437 | 437 | } |
| 438 | 438 | $retval .= $language; |
| 439 | - $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect' value='" . $optionLang . "' style='display:block'>"; |
|
| 439 | + $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect' value='".$optionLang."' style='display:block'>"; |
|
| 440 | 440 | } |
| 441 | 441 | $retval .= "</td>"; |
| 442 | 442 | // attribute content |
@@ -446,12 +446,12 @@ discard block |
||
| 446 | 446 | case \core\Options::TYPECODE_COORDINATES: |
| 447 | 447 | $this->allLocationCount = $this->allLocationCount + 1; |
| 448 | 448 | // display of the locations varies by map provider |
| 449 | - $classname = "\web\lib\admin\Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER']; |
|
| 449 | + $classname = "\web\lib\admin\Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER']; |
|
| 450 | 450 | $link = $classname::optionListDisplayCode($optionValue, $this->allLocationCount); |
| 451 | - $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-" . \core\Options::TYPECODE_TEXT . "]' id='S$rowid-input-text' value='$optionValue'>$link"; |
|
| 451 | + $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-".\core\Options::TYPECODE_TEXT."]' id='S$rowid-input-text' value='$optionValue'>$link"; |
|
| 452 | 452 | break; |
| 453 | 453 | case \core\Options::TYPECODE_FILE: |
| 454 | - $retval .= "<input readonly type='text' name='value[S$rowid-" . \core\Options::TYPECODE_STRING . "]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>"; |
|
| 454 | + $retval .= "<input readonly type='text' name='value[S$rowid-".\core\Options::TYPECODE_STRING."]' id='S".$rowid."-input-string' style='display:none' value='".urlencode($optionValue)."'>"; |
|
| 455 | 455 | $uiElements = new UIElements(); |
| 456 | 456 | switch ($optionName) { |
| 457 | 457 | case "eap:ca_file": |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | break; |
| 474 | 474 | case \core\Options::TYPECODE_ENUM_OPENROAMING: // is a string after all |
| 475 | 475 | $displayedVariant = $this->enumPrettyPrints[$optionValue]; |
| 476 | - $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>"; |
|
| 476 | + $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>"; |
|
| 477 | 477 | break; |
| 478 | 478 | case \core\Options::TYPECODE_STRING: |
| 479 | 479 | // fall-thorugh is intentional; mostly identical HTML code for the three types |
@@ -481,11 +481,11 @@ discard block |
||
| 481 | 481 | // fall-thorugh is intentional; mostly identical HTML code for the three types |
| 482 | 482 | case \core\Options::TYPECODE_TEXT: |
| 483 | 483 | $displayedVariant = $optionValue; // for all three types, value tag and actual display are identical |
| 484 | - $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>"; |
|
| 484 | + $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>"; |
|
| 485 | 485 | break; |
| 486 | 486 | case \core\Options::TYPECODE_BOOLEAN: |
| 487 | 487 | $displayedVariant = ($optionValue == "on" ? _("on") : _("off")); |
| 488 | - $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>"; |
|
| 488 | + $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>"; |
|
| 489 | 489 | break; |
| 490 | 490 | default: |
| 491 | 491 | // this should never happen! |
@@ -531,10 +531,10 @@ discard block |
||
| 531 | 531 | <td> |
| 532 | 532 | <button type='button' class='delete' onclick='"; |
| 533 | 533 | if ($prefillValue !== NULL && $item == "general:geo_coordinates") { |
| 534 | - $funcname = "Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'] . 'DeleteCoord'; |
|
| 535 | - $retval .= 'if (typeof ' . $funcname . ' === "function") { ' . $funcname . '(' . $this->allLocationCount . '); } '; |
|
| 534 | + $funcname = "Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'].'DeleteCoord'; |
|
| 535 | + $retval .= 'if (typeof '.$funcname.' === "function") { '.$funcname.'('.$this->allLocationCount.'); } '; |
|
| 536 | 536 | } |
| 537 | - $retval .= 'deleteOption("option-S' . $rowid . '")'; |
|
| 537 | + $retval .= 'deleteOption("option-S'.$rowid.'")'; |
|
| 538 | 538 | $retval .= "'>-</button> |
| 539 | 539 | </td> |
| 540 | 540 | </tr>"; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $this->installerPath = $cache['path']; |
| 87 | 87 | if ($this->installerPath !== NULL && $token === NULL && $password === NULL) { |
| 88 | 88 | $this->loggerInstance->debug(4, "Using cached installer for: $device\n"); |
| 89 | - $installerProperties['link'] = "API.php?action=downloadInstaller&lang=" . $this->languageInstance->getLang() . "&profile=$profileId&device=$device&generatedfor=$generatedFor&openroaming=$openRoaming"; |
|
| 89 | + $installerProperties['link'] = "API.php?action=downloadInstaller&lang=".$this->languageInstance->getLang()."&profile=$profileId&device=$device&generatedfor=$generatedFor&openroaming=$openRoaming"; |
|
| 90 | 90 | $installerProperties['mime'] = $cache['mime']; |
| 91 | 91 | } else { |
| 92 | 92 | $myInstaller = $this->generateNewInstaller($device, $profile, $generatedFor, $openRoaming, $token, $password); |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | $this->loggerInstance->debug(5, "generateNewInstaller() - Device setup done"); |
| 180 | 180 | $installer = $dev->writeInstaller(); |
| 181 | 181 | $this->loggerInstance->debug(5, "generateNewInstaller() - writeInstaller complete"); |
| 182 | - $iPath = $dev->FPATH . '/tmp/' . $installer; |
|
| 182 | + $iPath = $dev->FPATH.'/tmp/'.$installer; |
|
| 183 | 183 | if ($iPath && is_file($iPath)) { |
| 184 | 184 | if (isset($dev->options['mime'])) { |
| 185 | 185 | $out['mime'] = $dev->options['mime']; |
@@ -187,17 +187,17 @@ discard block |
||
| 187 | 187 | $info = new \finfo(); |
| 188 | 188 | $out['mime'] = $info->file($iPath, FILEINFO_MIME_TYPE); |
| 189 | 189 | } |
| 190 | - $this->installerPath = $dev->FPATH . '/' . $installer; |
|
| 190 | + $this->installerPath = $dev->FPATH.'/'.$installer; |
|
| 191 | 191 | rename($iPath, $this->installerPath); |
| 192 | 192 | $integerEap = (new \core\common\EAP($dev->selectedEap))->getIntegerRep(); |
| 193 | 193 | $profile->updateCache($device, $this->installerPath, $out['mime'], $integerEap); |
| 194 | 194 | if (\config\Master::DEBUG_LEVEL < 4) { |
| 195 | - \core\common\Entity::rrmdir($dev->FPATH . '/tmp'); |
|
| 195 | + \core\common\Entity::rrmdir($dev->FPATH.'/tmp'); |
|
| 196 | 196 | } |
| 197 | - $this->loggerInstance->debug(4, "Generated installer: " . $this->installerPath . ": for: $device, EAP:" . $integerEap . ", openRoaming: $openRoaming\n"); |
|
| 198 | - $out['link'] = "API.php?action=downloadInstaller&lang=" . $this->languageInstance->getLang() . "&profile=" . $profile->identifier . "&device=$device&generatedfor=$generatedFor&openroaming=$openRoaming"; |
|
| 197 | + $this->loggerInstance->debug(4, "Generated installer: ".$this->installerPath.": for: $device, EAP:".$integerEap.", openRoaming: $openRoaming\n"); |
|
| 198 | + $out['link'] = "API.php?action=downloadInstaller&lang=".$this->languageInstance->getLang()."&profile=".$profile->identifier."&device=$device&generatedfor=$generatedFor&openroaming=$openRoaming"; |
|
| 199 | 199 | } else { |
| 200 | - $this->loggerInstance->debug(2, "Installer generation failed for: " . $profile->identifier . ":$device:" . $this->languageInstance->getLang() . "openRoaming: $openRoaming\n"); |
|
| 200 | + $this->loggerInstance->debug(2, "Installer generation failed for: ".$profile->identifier.":$device:".$this->languageInstance->getLang()."openRoaming: $openRoaming\n"); |
|
| 201 | 201 | $out['link'] = 0; |
| 202 | 202 | } |
| 203 | 203 | } |
@@ -321,13 +321,13 @@ discard block |
||
| 321 | 321 | $file = $this->installerPath; |
| 322 | 322 | $filetype = $output['mime']; |
| 323 | 323 | $this->loggerInstance->debug(4, "installer MIME type:$filetype\n"); |
| 324 | - header("Content-type: " . $filetype); |
|
| 324 | + header("Content-type: ".$filetype); |
|
| 325 | 325 | if ($filetype !== "application/x-wifi-config") { // for those installers to work on Android, Content-Disposition MUST NOT be set |
| 326 | - header('Content-Disposition: inline; filename="' . basename($file) . '"'); |
|
| 326 | + header('Content-Disposition: inline; filename="'.basename($file).'"'); |
|
| 327 | 327 | } else { |
| 328 | 328 | header('Content-Transfer-Encoding: base64'); |
| 329 | 329 | } |
| 330 | - header('Content-Length: ' . filesize($file)); |
|
| 330 | + header('Content-Length: '.filesize($file)); |
|
| 331 | 331 | ob_clean(); |
| 332 | 332 | flush(); |
| 333 | 333 | readfile($file); |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | $filetype = $info->buffer($inputImage, FILEINFO_MIME_TYPE); |
| 350 | 350 | $offset = 60 * 60 * 24 * 30; |
| 351 | 351 | // gmdate cannot fail here - time() is its default argument (and integer), and we are adding an integer to it |
| 352 | - $expiresString = "Expires: " . /** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset) . " GMT"; |
|
| 352 | + $expiresString = "Expires: "./** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset)." GMT"; |
|
| 353 | 353 | $blob = $inputImage; |
| 354 | 354 | |
| 355 | 355 | if ($resize === TRUE) { |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | $filetype = 'image/png'; // default, only one code path where it can become different |
| 406 | 406 | list($width, $height, $resize) = $this->testForResize($widthIn, $heightIn); |
| 407 | 407 | if ($resize) { |
| 408 | - $logoFile = ROOT . '/web/downloads/logos/' . $identifier . '_' . $width . '_' . $height . '.png'; |
|
| 408 | + $logoFile = ROOT.'/web/downloads/logos/'.$identifier.'_'.$width.'_'.$height.'.png'; |
|
| 409 | 409 | } |
| 410 | 410 | if (is_file($logoFile)) { // $logoFile could be an empty string but then we will get a FALSE |
| 411 | 411 | $this->loggerInstance->debug(4, "Using cached logo $logoFile for: $identifier\n"); |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | if (!isset($device['match'])) { |
| 518 | 518 | continue; |
| 519 | 519 | } |
| 520 | - if (preg_match('/' . $device['match'] . '/', $browser)) { |
|
| 520 | + if (preg_match('/'.$device['match'].'/', $browser)) { |
|
| 521 | 521 | return $this->returnDevice($devId, $device); |
| 522 | 522 | } |
| 523 | 523 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | public function divSilverbullet() { |
| 125 | 125 | $retval = " |
| 126 | 126 | <div id='silverbullet'>" |
| 127 | - .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
| 127 | + .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
| 128 | 128 | "</div> |
| 129 | 129 | "; |
| 130 | 130 | return $retval; |
@@ -292,9 +292,9 @@ discard block |
||
| 292 | 292 | $retval .= '<tr>'; |
| 293 | 293 | } |
| 294 | 294 | $retval .= "<td><button id='".$d."'>".$D['display']."</button>" |
| 295 | - ."<div class='openroaming_selection' id='openroaming_".$d."'><button>eduroam</button> <button>eduroam + OpenRoaming</button></div>" |
|
| 296 | - ."<div class='device_info' id='info_".$d."'></div></td>" |
|
| 297 | - ."<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n"; |
|
| 295 | + ."<div class='openroaming_selection' id='openroaming_".$d."'><button>eduroam</button> <button>eduroam + OpenRoaming</button></div>" |
|
| 296 | + ."<div class='device_info' id='info_".$d."'></div></td>" |
|
| 297 | + ."<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n"; |
|
| 298 | 298 | $deviceIndex++; |
| 299 | 299 | } |
| 300 | 300 | $retval .= "</tbody>"; |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | <tr> |
| 363 | 363 | <td>" . |
| 364 | 364 | $this->Gui->catCopyright |
| 365 | - ." |
|
| 365 | + ." |
|
| 366 | 366 | </td>"; |
| 367 | 367 | |
| 368 | 368 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | public function divSilverbullet() { |
| 125 | 125 | $retval = " |
| 126 | 126 | <div id='silverbullet'>" |
| 127 | - .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
| 127 | + .$this->Gui->textTemplates->templates[user\SB_GO_AWAY]. |
|
| 128 | 128 | "</div> |
| 129 | 129 | "; |
| 130 | 130 | return $retval; |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | <div id='profiles'> <!-- this is the profile selection filled during run time --> |
| 223 | 223 | <div id='profiles_h' class='sub_h'>".$this->Gui->textTemplates->templates[user\PROFILE_SELECTION]." |
| 224 | 224 | </div>" . |
| 225 | - "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" . |
|
| 225 | + "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>". |
|
| 226 | 226 | "</div>"; |
| 227 | 227 | } |
| 228 | 228 | |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | public function divInstitution($selectButton = TRUE) { |
| 251 | 251 | $retval = "<div id='institution_name'> |
| 252 | 252 | <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" . |
| 253 | - ($selectButton ? "<a id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "") . |
|
| 253 | + ($selectButton ? "<a id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : ""). |
|
| 254 | 254 | "</div>"; |
| 255 | 255 | $retval .= $this->emptyImage('idp_logo', 'IdP Logo'); |
| 256 | 256 | return $retval; |
