GEANT /
CAT
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | $retval = "<div class='sidebar'><p>"; |
| 67 | 67 | |
| 68 | 68 | if ($advancedControls) { |
| 69 | - $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name'] |
|
| 69 | + $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name'] |
|
| 70 | 70 | ."<br/> |
| 71 | 71 | <br/> |
| 72 | - <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a> |
|
| 73 | - <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> "; |
|
| 72 | + <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a> |
|
| 73 | + <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> "; |
|
| 74 | 74 | } |
| 75 | - $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a> |
|
| 75 | + $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a> |
|
| 76 | 76 | </p> |
| 77 | 77 | </div> <!-- sidebar -->"; |
| 78 | 78 | \core\common\Entity::outOfThePotatoes(); |
@@ -96,23 +96,23 @@ discard block |
||
| 96 | 96 | <h1>$cap1</h1> |
| 97 | 97 | </div><!--header_captions--> |
| 98 | 98 | <div id='langselection' style='padding-top:20px; padding-left:10px;'> |
| 99 | - <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . " |
|
| 99 | + <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")." |
|
| 100 | 100 | <select id='lang' name='lang' onchange='this.form.submit()'>"; |
| 101 | 101 | |
| 102 | 102 | foreach (\config\Master::LANGUAGES as $lang => $getValue) { |
| 103 | - $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> "; |
|
| 103 | + $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> "; |
|
| 104 | 104 | } |
| 105 | 105 | $retval .= "</select>"; |
| 106 | 106 | |
| 107 | 107 | foreach ($_GET as $getVar => $getValue) { |
| 108 | 108 | $filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING); |
| 109 | 109 | if ($getVar != "lang" && $getValue != "") { |
| 110 | - $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>"; |
|
| 110 | + $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>"; |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | $retval .= "</form> |
| 114 | 114 | </div><!--langselection-->"; |
| 115 | - $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png"; |
|
| 115 | + $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png"; |
|
| 116 | 116 | $retval .= "<div class='consortium_logo'> |
| 117 | 117 | <img id='test_locate' src='$logoUrl' alt='Consortium Logo'> |
| 118 | 118 | </div> <!-- consortium_logo --> |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | |
| 206 | 206 | if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") { |
| 207 | 207 | $retval .= "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'> |
| 208 | - <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p> |
|
| 208 | + <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p> |
|
| 209 | 209 | </div><!--header_MOTD-->"; |
| 210 | 210 | } |
| 211 | 211 | $retval .= $this->sidebar($advancedControls); |
@@ -231,9 +231,9 @@ discard block |
||
| 231 | 231 | <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'> |
| 232 | 232 | <head lang='$ourlocale'> |
| 233 | 233 | <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>"; |
| 234 | - $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php"; |
|
| 234 | + $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php"; |
|
| 235 | 235 | $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />"; |
| 236 | - $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>"; |
|
| 236 | + $retval .= "<title>".htmlspecialchars($pagetitle)."</title>"; |
|
| 237 | 237 | return $retval; |
| 238 | 238 | } |
| 239 | 239 | |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | // we may need to jump up one dir if we are either in admin/ or accountstatus/ |
| 248 | 248 | // (accountstatus courtesy of my good mood. It's userspace not admin space so |
| 249 | 249 | // it shouldn't be using this function any more.) |
| 250 | - $logoBase = \core\CAT::getRootUrlPath() . "/resources/images"; |
|
| 250 | + $logoBase = \core\CAT::getRootUrlPath()."/resources/images"; |
|
| 251 | 251 | return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/> |
| 252 | 252 | <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span> |
| 253 | 253 | <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>"; |
@@ -269,9 +269,9 @@ discard block |
||
| 269 | 269 | <table style='width:100%'> |
| 270 | 270 | <tr> |
| 271 | 271 | <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'> |
| 272 | - " . $cat->catCopyright . "</td>"; |
|
| 272 | + " . $cat->catCopyright."</td>"; |
|
| 273 | 273 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
| 274 | - $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['display_name']) . "</a></td>"; |
|
| 274 | + $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name'])."</a></td>"; |
|
| 275 | 275 | } |
| 276 | 276 | $retval .= " <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>"; |
| 277 | 277 | |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | if (is_scalar($value)) { |
| 124 | 124 | $this->value = strval($value); |
| 125 | 125 | } else { |
| 126 | - throw new Exception("unexpected value type passed" . gettype($value)); |
|
| 126 | + throw new Exception("unexpected value type passed".gettype($value)); |
|
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | * License: see the web/copyright.php file in the file structure |
| 9 | 9 | * ****************************************************************************** |
| 10 | 10 | */ |
| 11 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 11 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 12 | 12 | |
| 13 | 13 | const AREAS = ["web_admin", "web_user", "devices", "core", "diagnostics"]; |
| 14 | 14 | foreach (\config\Master::LANGUAGES as $lang => $details) { |
@@ -47,9 +47,9 @@ discard block |
||
| 47 | 47 | $Gui->loggerInstance->debug(4, $operatingSystem); |
| 48 | 48 | $uiElements = new web\lib\admin\UIElements(); |
| 49 | 49 | if ($operatingSystem) { |
| 50 | - print "recognisedOS = '" . $operatingSystem['device'] . "';\n"; |
|
| 50 | + print "recognisedOS = '".$operatingSystem['device']."';\n"; |
|
| 51 | 51 | } |
| 52 | -require dirname(__DIR__) . '/user/js/cat_js.php'; |
|
| 52 | +require dirname(__DIR__).'/user/js/cat_js.php'; |
|
| 53 | 53 | ?> |
| 54 | 54 | var lang = "<?php echo($Gui->languageInstance->getLang()) ?>"; |
| 55 | 55 | </script> |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | <?php |
| 80 | 80 | switch ($statusInfo['errorcode']) { |
| 81 | 81 | case "GENERATOR_CONSUMED": |
| 82 | - echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to re-use download link"), TRUE) . "<p>"; |
|
| 82 | + echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to re-use download link"), TRUE)."<p>"; |
|
| 83 | 83 | break; |
| 84 | 84 | case NULL: |
| 85 | 85 | default: |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | echo " "; |
| 103 | 103 | echo sprintf(ngettext("<strong>%d</strong> of your credentials is not valid any more.", "<strong>%d</strong> of your credentials are not valid any more.", $noGoodCerts), $noGoodCerts); |
| 104 | 104 | } |
| 105 | - echo " <span id='detailtext'>" . _("I want to see the details.") . "</span>"; |
|
| 105 | + echo " <span id='detailtext'>"._("I want to see the details.")."</span>"; |
|
| 106 | 106 | echo "<table id='cert_details'></table>"; |
| 107 | 107 | } |
| 108 | 108 | } |
@@ -111,60 +111,60 @@ discard block |
||
| 111 | 111 | case \core\SilverbulletInvitation::SB_TOKENSTATUS_VALID: // treat both cases as equal |
| 112 | 112 | case \core\SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED: |
| 113 | 113 | if ($statusInfo['invitation_object']->activationsTotal > 1) { // only show this extra info in the non-trivial case. |
| 114 | - echo "<h3>" . sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['invitation_object']->activationsRemaining, $statusInfo['invitation_object']->activationsTotal - $statusInfo['invitation_object']->activationsRemaining) . "</h3>"; |
|
| 114 | + echo "<h3>".sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['invitation_object']->activationsRemaining, $statusInfo['invitation_object']->activationsTotal - $statusInfo['invitation_object']->activationsRemaining)."</h3>"; |
|
| 115 | 115 | } |
| 116 | 116 | if (!$statusInfo["OS"]) { |
| 117 | - echo "<p>" . _("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>"; |
|
| 117 | + echo "<p>"._("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.")."</p>"; |
|
| 118 | 118 | break; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | $dev = new \core\DeviceFactory($statusInfo['OS']['device']); |
| 122 | 122 | $dev->device->calculatePreferredEapType([new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET)]); |
| 123 | 123 | if ($dev->device->selectedEap == []) { |
| 124 | - echo "<p>" . sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>"; |
|
| 124 | + echo "<p>".sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display'])."</p>"; |
|
| 125 | 125 | break; |
| 126 | 126 | } |
| 127 | - $message = $dev->device->options['message'] ?? '' ; |
|
| 127 | + $message = $dev->device->options['message'] ?? ''; |
|
| 128 | 128 | |
| 129 | 129 | $sbMessage = $dev->device->options['sb_message'] ?? ''; |
| 130 | 130 | if ($message != '' && $sbMessage != '') { |
| 131 | - $message = $message . "<p>" . $sbMessage; |
|
| 131 | + $message = $message."<p>".$sbMessage; |
|
| 132 | 132 | } else { |
| 133 | - $message = $message . $sbMessage; |
|
| 133 | + $message = $message.$sbMessage; |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - echo "<div id='sb_download_message'><p>" . sprintf(_("You can now download a personalised %s installation program."), \config\ConfAssistant::CONSORTIUM['display_name']); |
|
| 136 | + echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised %s installation program."), \config\ConfAssistant::CONSORTIUM['display_name']); |
|
| 137 | 137 | // echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']); |
| 138 | 138 | echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']); |
| 139 | - echo "<p style='color:red;'>" . sprintf(_("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local %s administrator."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>"; |
|
| 140 | - echo "<p>" . _("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.") . "</p></div>"; |
|
| 139 | + echo "<p style='color:red;'>".sprintf(_("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local %s administrator."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>"; |
|
| 140 | + echo "<p>"._("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.")."</p></div>"; |
|
| 141 | 141 | |
| 142 | 142 | $importPassword = \core\common\Entity::randomString(4, "0123456789"); |
| 143 | 143 | $profile = new \core\ProfileSilverbullet($statusInfo['profile']->identifier, NULL); |
| 144 | 144 | |
| 145 | - echo "<h2>" . sprintf(_("Import PIN: %s"), $importPassword) . "</h2>"; |
|
| 145 | + echo "<h2>".sprintf(_("Import PIN: %s"), $importPassword)."</h2>"; |
|
| 146 | 146 | $_SESSION['individualtoken'] = $cleanToken; |
| 147 | 147 | $_SESSION['importpassword'] = $importPassword; |
| 148 | - echo "<input type='hidden' name='device' value='" . $statusInfo['OS']['device'] . "'/>"; |
|
| 148 | + echo "<input type='hidden' name='device' value='".$statusInfo['OS']['device']."'/>"; |
|
| 149 | 149 | echo "<input type='hidden' name='generatedfor' value='silverbullet'/>"; |
| 150 | - echo "<button class='large_button' id='user_button_sb' style='height:80px;'><span id='user_buttonnnn'>" . sprintf(_("Click here to download your %s installer!"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</span></button>"; |
|
| 150 | + echo "<button class='large_button' id='user_button_sb' style='height:80px;'><span id='user_buttonnnn'>".sprintf(_("Click here to download your %s installer!"), \config\ConfAssistant::CONSORTIUM['display_name'])."</span></button>"; |
|
| 151 | 151 | echo "<div class='device_info' id='info_g_sb'></div>"; |
| 152 | 152 | break; |
| 153 | 153 | case \core\SilverbulletInvitation::SB_TOKENSTATUS_EXPIRED: |
| 154 | 154 | echo "<h2>Invitation link expired</h2>"; |
| 155 | - echo "<p>" . sprintf(_("Unfortunately, the invitation link you just used is too old. The %s sign-up invitation was valid until %s. You cannot use this link any more. Please ask your administrator to issue you a new invitation link."), \config\ConfAssistant::CONSORTIUM['display_name'], $statusInfo['invitation_object']->expiry) . "</p>"; |
|
| 155 | + echo "<p>".sprintf(_("Unfortunately, the invitation link you just used is too old. The %s sign-up invitation was valid until %s. You cannot use this link any more. Please ask your administrator to issue you a new invitation link."), \config\ConfAssistant::CONSORTIUM['display_name'], $statusInfo['invitation_object']->expiry)."</p>"; |
|
| 156 | 156 | echo "<p>Below is all the information about your account's other login details, if any.</p>"; |
| 157 | 157 | // do NOT break, display full account info instead (this was a previously valid token after all) |
| 158 | 158 | case \core\SilverbulletInvitation::SB_TOKENSTATUS_REDEEMED: |
| 159 | 159 | // nothing to say really. User got the breakdown of certs above, and this link doesn't give him any new ones. |
| 160 | 160 | break; |
| 161 | 161 | case \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID: |
| 162 | - echo "<h2>" . _("Account information not found") . "</h2>"; |
|
| 163 | - echo "<p>" . sprintf(_("The invitation link you followed does not map to any invititation we have on file.") . "</p><p>" . _("You should use the exact link you got during sign-up to come here. Alternatively, if you have a valid %s credential already, you can visit this page and Accept the question about logging in with a client certificate (select a certificate with a name ending in '…%s')."),\config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::SILVERBULLET['realm_suffix']); |
|
| 162 | + echo "<h2>"._("Account information not found")."</h2>"; |
|
| 163 | + echo "<p>".sprintf(_("The invitation link you followed does not map to any invititation we have on file.")."</p><p>"._("You should use the exact link you got during sign-up to come here. Alternatively, if you have a valid %s credential already, you can visit this page and Accept the question about logging in with a client certificate (select a certificate with a name ending in '…%s')."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::SILVERBULLET['realm_suffix']); |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($statusInfo['profile_id']) && isset($statusInfo['idp_id'])) { |
| 166 | - echo "<input type='hidden' name='profile' id='profile_id' value='" . $statusInfo['profile_id'] . "'/>"; |
|
| 167 | - echo "<input type='hidden' id='inst_id' name='idp' value='" . $statusInfo['idp_id'] . "'/>"; |
|
| 166 | + echo "<input type='hidden' name='profile' id='profile_id' value='".$statusInfo['profile_id']."'/>"; |
|
| 167 | + echo "<input type='hidden' id='inst_id' name='idp' value='".$statusInfo['idp_id']."'/>"; |
|
| 168 | 168 | } |
| 169 | 169 | ?> |
| 170 | 170 | </div> |
@@ -184,18 +184,18 @@ discard block |
||
| 184 | 184 | $attributes = $statusInfo['attributes']; |
| 185 | 185 | $supportInfo = ''; |
| 186 | 186 | if (!empty($attributes['local_url'])) { |
| 187 | - $supportInfo .= '<tr><td>' . ("WWW:") . '</td><td><a href="' . $attributes['local_url'] . '" target="_blank">' . $attributes['local_url'] . '</a></td></tr>'; |
|
| 187 | + $supportInfo .= '<tr><td>'.("WWW:").'</td><td><a href="'.$attributes['local_url'].'" target="_blank">'.$attributes['local_url'].'</a></td></tr>'; |
|
| 188 | 188 | } |
| 189 | 189 | if (!empty($attributes['local_email'])) { |
| 190 | - $supportInfo .= '<tr><td>' . ("email:") . '</td><td><a href="' . $attributes['local_email'] . '" target="_blank">' . $attributes['local_email'] . '</a></td></tr>'; |
|
| 190 | + $supportInfo .= '<tr><td>'.("email:").'</td><td><a href="'.$attributes['local_email'].'" target="_blank">'.$attributes['local_email'].'</a></td></tr>'; |
|
| 191 | 191 | } |
| 192 | 192 | if (!empty($attributes['local_phone'])) { |
| 193 | - $supportInfo .= '<tr><td>' . ("tel:") . '</td><td><a href="' . $attributes['local_phone'] . '" target="_blank">' . $attributes['local_phone'] . '</a></td></tr>'; |
|
| 193 | + $supportInfo .= '<tr><td>'.("tel:").'</td><td><a href="'.$attributes['local_phone'].'" target="_blank">'.$attributes['local_phone'].'</a></td></tr>'; |
|
| 194 | 194 | } |
| 195 | 195 | if ($supportInfo != '') { |
| 196 | - $supportInfo = "<table><tr><th colspan='2'>" . _("If you encounter problems, then you can obtain direct assistance from your organisation at:") . "</th></tr>$supportInfo</table>"; |
|
| 196 | + $supportInfo = "<table><tr><th colspan='2'>"._("If you encounter problems, then you can obtain direct assistance from your organisation at:")."</th></tr>$supportInfo</table>"; |
|
| 197 | 197 | } else { |
| 198 | - $supportInfo = "<table><tr><th colspan='2'>" . _("If you encounter problems you should ask those who gave you your account for help.") . "</th></tr></table>"; |
|
| 198 | + $supportInfo = "<table><tr><th colspan='2'>"._("If you encounter problems you should ask those who gave you your account for help.")."</th></tr></table>"; |
|
| 199 | 199 | } |
| 200 | 200 | ?> |
| 201 | 201 | <script> |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | var logo = <?php echo $statusInfo['idp_logo']; ?>; |
| 205 | 205 | var idpId = <?php echo $statusInfo['idp_id']; ?>; |
| 206 | 206 | <?php |
| 207 | - if($message != '') { |
|
| 207 | + if ($message != '') { |
|
| 208 | 208 | echo "message = \"$message\";\n"; |
| 209 | 209 | } |
| 210 | 210 | ?> |
@@ -607,8 +607,7 @@ |
||
| 607 | 607 | $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT); |
| 608 | 608 | if ($output === FALSE) { |
| 609 | 609 | $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg()); |
| 610 | - } |
|
| 611 | - else { |
|
| 610 | + } else { |
|
| 612 | 611 | echo $output; |
| 613 | 612 | } |
| 614 | 613 | } |
@@ -236,7 +236,7 @@ |
||
| 236 | 236 | const AUXATTRIB_SB_USERNAME = "ATTRIB-MANAGED-USERNAME"; |
| 237 | 237 | const AUXATTRIB_SB_USERID = "ATTRIB-MANAGED-USERID"; |
| 238 | 238 | const AUXATTRIB_SB_CERTSERIAL = "ATTRIB-MANAGED-CERTSERIAL"; |
| 239 | - const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
| 239 | + const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
| 240 | 240 | const AUXATTRIB_SB_CERTANNOTATION = "ATTRIB-MANAGED-CERTANNOTATION"; |
| 241 | 241 | const AUXATTRIB_SB_EXPIRY = "ATTRIB-MANAGED-EXPIRY"; /* MySQL timestamp format */ |
| 242 | 242 | const AUXATTRIB_TOKEN = "ATTRIB-TOKEN"; |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | const ACTIONS = [ |
| 250 | 250 | // Inst-level actions. |
| 251 | 251 | API::ACTION_NEWINST_BY_REF => [ |
| 252 | - "REQ" => [API::AUXATTRIB_EXTERNALID,], |
|
| 252 | + "REQ" => [API::AUXATTRIB_EXTERNALID, ], |
|
| 253 | 253 | "OPT" => [ |
| 254 | 254 | 'general:geo_coordinates', |
| 255 | 255 | 'general:logo_file', |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | ], |
| 267 | 267 | ], |
| 268 | 268 | API::ACTION_NEWINST => [ |
| 269 | - "REQ" => [API::AUXATTRIB_INSTTYPE,], // "IdP", "SP" or "IdPSP" |
|
| 269 | + "REQ" => [API::AUXATTRIB_INSTTYPE, ], // "IdP", "SP" or "IdPSP" |
|
| 270 | 270 | "OPT" => [ |
| 271 | 271 | 'general:instname', |
| 272 | 272 | 'general:geo_coordinates', |
@@ -562,8 +562,8 @@ discard block |
||
| 562 | 562 | |
| 563 | 563 | case \core\Options::TYPECODE_COORDINATES: |
| 564 | 564 | $extension = \core\Options::TYPECODE_TEXT; |
| 565 | - $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#"; |
|
| 566 | - $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE']; |
|
| 565 | + $coercedInline["option"][$basename] = $oneAttrib['NAME']."#"; |
|
| 566 | + $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE']; |
|
| 567 | 567 | break; |
| 568 | 568 | case \core\Options::TYPECODE_TEXT: |
| 569 | 569 | // Fall-through: they all get the same treatment. |
@@ -573,18 +573,18 @@ discard block |
||
| 573 | 573 | // Fall-through: they all get the same treatment. |
| 574 | 574 | case \core\Options::TYPECODE_INTEGER: |
| 575 | 575 | $extension = $optionInfo['type']; |
| 576 | - $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#"; |
|
| 577 | - $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE']; |
|
| 576 | + $coercedInline["option"][$basename] = $oneAttrib['NAME']."#"; |
|
| 577 | + $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE']; |
|
| 578 | 578 | if ($optionInfo['flag'] == "ML") { |
| 579 | - $coercedInline["value"][$basename . "-lang"] = $oneAttrib['LANG']; |
|
| 579 | + $coercedInline["value"][$basename."-lang"] = $oneAttrib['LANG']; |
|
| 580 | 580 | } |
| 581 | 581 | break; |
| 582 | 582 | case \core\Options::TYPECODE_FILE: |
| 583 | 583 | // Binary data is expected in base64 encoding. This is true also for PEM files! |
| 584 | 584 | $extension = $optionInfo['type']; |
| 585 | - $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#"; |
|
| 586 | - file_put_contents($dir['dir'] . "/" . $basename . "-" . $extension, base64_decode($oneAttrib['VALUE'])); |
|
| 587 | - $coercedFile["value"]['tmp_name'][$basename . "-" . $extension] = $dir['dir'] . "/" . $basename . "-" . $extension; |
|
| 585 | + $coercedInline["option"][$basename] = $oneAttrib['NAME']."#"; |
|
| 586 | + file_put_contents($dir['dir']."/".$basename."-".$extension, base64_decode($oneAttrib['VALUE'])); |
|
| 587 | + $coercedFile["value"]['tmp_name'][$basename."-".$extension] = $dir['dir']."/".$basename."-".$extension; |
|
| 588 | 588 | break; |
| 589 | 589 | default: |
| 590 | 590 | throw new Exception("We don't seem to know this type code!"); |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | public function returnSuccess($details) { |
| 614 | 614 | $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT); |
| 615 | 615 | if ($output === FALSE) { |
| 616 | - $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg()); |
|
| 616 | + $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ".json_last_error()." - ".json_last_error_msg()); |
|
| 617 | 617 | } |
| 618 | 618 | else { |
| 619 | 619 | echo $output; |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once dirname(dirname(__DIR__)) . '/config/_config.php'; |
|
| 22 | +require_once dirname(dirname(__DIR__)).'/config/_config.php'; |
|
| 23 | 23 | |
| 24 | 24 | $uiElements = new web\lib\admin\UIElements(); |
| 25 | 25 | |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | // filesystem cleanup |
| 76 | 76 | case web\lib\common\FormElements::BUTTON_DELETE: |
| 77 | 77 | $i = web\lib\admin\Maintenance::deleteObsoleteTempDirs(); |
| 78 | - echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>"; |
|
| 78 | + echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>"; |
|
| 79 | 79 | break; |
| 80 | 80 | default: |
| 81 | 81 | break; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'"); |
| 142 | 142 | // SELECT -> mysqli_result, not boolean |
| 143 | 143 | while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) { |
| 144 | - echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>"; |
|
| 144 | + echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>"; |
|
| 145 | 145 | $gross_admin = $gross_admin + $a->admin; |
| 146 | 146 | $gross_user = $gross_user + $a->user; |
| 147 | 147 | $gross_silverbullet = $gross_silverbullet + $a->silverbullet; |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
| 3 | 3 | /** |
| 4 | - * check if URL responds with 200 |
|
| 5 | - * |
|
| 6 | - * @param string $srv server name |
|
| 7 | - * @return integer or NULL |
|
| 4 | + * check if URL responds with 200 |
|
| 5 | + * |
|
| 6 | + * @param string $srv server name |
|
| 7 | + * @return integer or NULL |
|
| 8 | 8 | */ |
| 9 | 9 | function checkConfigRADIUSDaemon ($srv) { |
| 10 | 10 | $ch = curl_init(); |
@@ -1,22 +1,22 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 2 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 3 | 3 | /** |
| 4 | 4 | * check if URL responds with 200 |
| 5 | 5 | * |
| 6 | 6 | * @param string $srv server name |
| 7 | 7 | * @return integer or NULL |
| 8 | 8 | */ |
| 9 | -function checkConfigRADIUSDaemon ($srv) { |
|
| 9 | +function checkConfigRADIUSDaemon($srv) { |
|
| 10 | 10 | $ch = curl_init(); |
| 11 | 11 | if ($ch === FALSE) { |
| 12 | 12 | return NULL; |
| 13 | 13 | } |
| 14 | 14 | $timeout = 10; |
| 15 | - curl_setopt ( $ch, CURLOPT_URL, $srv ); |
|
| 16 | - curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 ); |
|
| 17 | - curl_setopt ( $ch, CURLOPT_TIMEOUT, $timeout ); |
|
| 15 | + curl_setopt($ch, CURLOPT_URL, $srv); |
|
| 16 | + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
|
| 17 | + curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
|
| 18 | 18 | curl_exec($ch); |
| 19 | - $http_code = curl_getinfo( $ch, CURLINFO_HTTP_CODE ); |
|
| 19 | + $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); |
|
| 20 | 20 | curl_close($ch); |
| 21 | 21 | if ($http_code == 200) { |
| 22 | 22 | return 1; |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | $siteStatus = array(); |
| 55 | 55 | foreach (array_keys($brokenDeployments) as $server_id) { |
| 56 | - print "check $server_id " . $radiusSite[$server_id] . "\n"; |
|
| 57 | - $siteStatus[$server_id] = checkConfigRADIUSDaemon('http://' . $radiusSite[$server_id]); |
|
| 56 | + print "check $server_id ".$radiusSite[$server_id]."\n"; |
|
| 57 | + $siteStatus[$server_id] = checkConfigRADIUSDaemon('http://'.$radiusSite[$server_id]); |
|
| 58 | 58 | if ($siteStatus[$server_id]) { |
| 59 | 59 | echo "\ncheck radius\n"; |
| 60 | 60 | echo \config\Diagnostics::RADIUSSPTEST['port']."\n"; |
@@ -92,10 +92,10 @@ discard block |
||
| 92 | 92 | <NodeName>AAAServerTrustRoot</NodeName>'; |
| 93 | 93 | foreach ($this->attributes['internal:CAs'][0] as $oneCert) { |
| 94 | 94 | $retval .= '<Node> |
| 95 | - <NodeName>' . $oneCert['uuid'] . '</NodeName> |
|
| 95 | + <NodeName>' . $oneCert['uuid'].'</NodeName> |
|
| 96 | 96 | <Node> |
| 97 | 97 | <NodeName>CertSHA256Fingerprint</NodeName> |
| 98 | - <Value>' . $oneCert['sha256'] . '</Value> |
|
| 98 | + <Value>' . $oneCert['sha256'].'</Value> |
|
| 99 | 99 | </Node> |
| 100 | 100 | </Node> |
| 101 | 101 | '; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $now = new \DateTime(); |
| 115 | 115 | return '<Node> |
| 116 | 116 | <NodeName>CreationDate</NodeName> |
| 117 | - <Value>' . $now->format("Y-m-d") . "T" . $now->format("H:i:s") . "Z" . '</Value> |
|
| 117 | + <Value>' . $now->format("Y-m-d")."T".$now->format("H:i:s")."Z".'</Value> |
|
| 118 | 118 | </Node>'; |
| 119 | 119 | } |
| 120 | 120 | |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | <NodeName>HomeSP</NodeName> |
| 129 | 129 | <Node> |
| 130 | 130 | <NodeName>FriendlyName</NodeName> |
| 131 | - <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']) . '</Value> |
|
| 131 | + <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']).'</Value> |
|
| 132 | 132 | </Node> |
| 133 | 133 | <Node> |
| 134 | 134 | <NodeName>FQDN</NodeName> |
| 135 | - <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */ . '</Value> |
|
| 135 | + <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */.'</Value> |
|
| 136 | 136 | </Node> |
| 137 | 137 | <Node> |
| 138 | 138 | <NodeName>RoamingConsortiumOI</NodeName> |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $oiList .= ","; |
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | - $retval .= $oiList . '</Value> |
|
| 151 | + $retval .= $oiList.'</Value> |
|
| 152 | 152 | </Node> |
| 153 | 153 | </Node> |
| 154 | 154 | '; |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | <NodeName>Credential</NodeName> |
| 166 | 166 | <Node> |
| 167 | 167 | <NodeName>Realm</NodeName> |
| 168 | - <Value>' . $this->attributes['internal:realm'][0] . '</Value> |
|
| 168 | + <Value>' . $this->attributes['internal:realm'][0].'</Value> |
|
| 169 | 169 | </Node>'; |
| 170 | 170 | /* the example file I got did not include CreationDate, so omit it |
| 171 | 171 | * |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | </Node> |
| 181 | 181 | <Node> |
| 182 | 182 | <NodeName>CertSHA256Fingerprint</NodeName> |
| 183 | - <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */ . '</Value> |
|
| 183 | + <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */.'</Value> |
|
| 184 | 184 | </Node> |
| 185 | 185 | </Node> |
| 186 | 186 | </Node> |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | // foresee signing. |
| 299 | 299 | // but if they ever change their mind, we are prepared |
| 300 | 300 | |
| 301 | - $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null"); |
|
| 301 | + $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null"); |
|
| 302 | 302 | if ($outputFromSigning === FALSE) { |
| 303 | 303 | $this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n"); |
| 304 | 304 | } |
@@ -201,7 +201,7 @@ |
||
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | if (!empty($this->attributes['internal:realm'][0])) { |
| 204 | - $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
|
| 204 | + $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
@@ -45,10 +45,10 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | */ |
| 47 | 47 | public function writeInstaller() { |
| 48 | - $installerPath = $this->installerBasename . ".sh"; |
|
| 48 | + $installerPath = $this->installerBasename.".sh"; |
|
| 49 | 49 | $this->copyFile("eduroam_linux_main.sh", $installerPath); |
| 50 | 50 | |
| 51 | - if ( !file_exists($installerPath) ) { |
|
| 51 | + if (!file_exists($installerPath)) { |
|
| 52 | 52 | throw new Exception('File not found.'); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -61,11 +61,11 @@ discard block |
||
| 61 | 61 | fseek($installer, 0, SEEK_END); |
| 62 | 62 | $this->writeMessages($installer); |
| 63 | 63 | $this->writeConfigVars($installer); |
| 64 | - fwrite($installer, 'printf -v INIT_INFO "$INIT_INFO_TMP" "$ORGANISATION" "$EMAIL" "$URL"' . "\n"); |
|
| 65 | - fwrite($installer, 'printf -v INIT_CONFIRMATION "$INIT_CONFIRMATION_TMP" "$ORGANISATION"' . "\n\n"); |
|
| 66 | - fwrite($installer, 'main "$@"; exit' . "\n"); |
|
| 64 | + fwrite($installer, 'printf -v INIT_INFO "$INIT_INFO_TMP" "$ORGANISATION" "$EMAIL" "$URL"'."\n"); |
|
| 65 | + fwrite($installer, 'printf -v INIT_CONFIRMATION "$INIT_CONFIRMATION_TMP" "$ORGANISATION"'."\n\n"); |
|
| 66 | + fwrite($installer, 'main "$@"; exit'."\n"); |
|
| 67 | 67 | } catch (Exception $e) { |
| 68 | - echo 'Error message: ' .$e->getMessage(); |
|
| 68 | + echo 'Error message: '.$e->getMessage(); |
|
| 69 | 69 | } finally { |
| 70 | 70 | fclose($installer); |
| 71 | 71 | return($installerPath); |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | $out .= "<p>"; |
| 88 | 88 | if ($ssidCount > 1) { |
| 89 | 89 | if ($ssidCount > 2) { |
| 90 | - $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " "; |
|
| 90 | + $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." "; |
|
| 91 | 91 | } else { |
| 92 | - $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " "; |
|
| 92 | + $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." "; |
|
| 93 | 93 | } |
| 94 | 94 | $iterator = 0; |
| 95 | 95 | foreach ($this->attributes['internal:SSID'] as $ssid => $v) { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @return void |
| 127 | 127 | */ |
| 128 | 128 | private function writeConfigLine($file, $name, $text) { |
| 129 | - $out = $name . '="' . $text . '"' . "\n"; |
|
| 129 | + $out = $name.'="'.$text.'"'."\n"; |
|
| 130 | 130 | // fwrite($file, wordwrap($out, 70, "\n")); |
| 131 | 131 | fwrite($file, $out); |
| 132 | 132 | |
@@ -209,18 +209,18 @@ discard block |
||
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | if ($outerId !== NULL) { |
| 212 | - $configRaw['ANONYMOUS_IDENTITY'] = '"' . $outerId . '"'; |
|
| 212 | + $configRaw['ANONYMOUS_IDENTITY'] = '"'.$outerId.'"'; |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | if (!empty($this->attributes['internal:realm'][0])) { |
| 216 | 216 | $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 219 | + if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 220 | 220 | $configRaw['HINT_USER_INPUT'] = true; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 223 | + if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 224 | 224 | $configRaw['VERIFY_USER_REALM_INPUT'] = true; |
| 225 | 225 | } else { |
| 226 | 226 | $configRaw['VERIFY_USER_REALM_INPUT'] = false; |
@@ -231,19 +231,19 @@ discard block |
||
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | foreach ($configRaw as $name => $value) { |
| 234 | - fwrite($file, $name ."=". $value . "\n"); |
|
| 234 | + fwrite($file, $name."=".$value."\n"); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | if ($tou === '') { |
| 238 | 238 | fwrite($file, "TOU=\"\"\n"); |
| 239 | 239 | } else { |
| 240 | - fwrite($file, "TOU=\"" . $tou . "\"\n"); |
|
| 240 | + fwrite($file, "TOU=\"".$tou."\"\n"); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - fwrite($file, "CA_CERTIFICATE=\"" . $this->mkCAfile() . "\"\n"); |
|
| 243 | + fwrite($file, "CA_CERTIFICATE=\"".$this->mkCAfile()."\"\n"); |
|
| 244 | 244 | $sbUserFile = $this->mkSbUserFile(); |
| 245 | 245 | if ($sbUserFile !== '') { |
| 246 | - fwrite($file, "SB_USER_FILE=\"" . $sbUserFile . "\"\n"); |
|
| 246 | + fwrite($file, "SB_USER_FILE=\"".$sbUserFile."\"\n"); |
|
| 247 | 247 | } |
| 248 | 248 | } |
| 249 | 249 | |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | $out .= "'DNS:$oneServer'"; |
| 297 | 297 | } |
| 298 | - return "(" . $out. ")"; |
|
| 298 | + return "(".$out.")"; |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | /** |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | foreach ($ssids as $ssid => $cipher) { |
| 310 | 310 | $outArray[] = "'$ssid'"; |
| 311 | 311 | } |
| 312 | - return '(' . implode(' ', $outArray) . ')'; |
|
| 312 | + return '('.implode(' ', $outArray).')'; |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | /** |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | $outArray[] = "'$ssid'"; |
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | - return '(' . implode(', ', $outArray) . ')'; |
|
| 328 | + return '('.implode(', ', $outArray).')'; |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | /** |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | * |
| 334 | 334 | * @return string |
| 335 | 335 | */ |
| 336 | - private function mkCAfile(){ |
|
| 336 | + private function mkCAfile() { |
|
| 337 | 337 | $out = ''; |
| 338 | 338 | $cAlist = $this->attributes['internal:CAs'][0]; |
| 339 | 339 | foreach ($cAlist as $oneCa) { |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | */ |
| 350 | 350 | private function mkIntro() { |
| 351 | 351 | \core\common\Entity::intoThePotatoes(); |
| 352 | - $out = _("This installer has been prepared for %s") . '\n\n' . _("More information and comments:") . '\n\nE-Mail: %s\nWWW: %s\n\n' . |
|
| 352 | + $out = _("This installer has been prepared for %s").'\n\n'._("More information and comments:").'\n\nE-Mail: %s\nWWW: %s\n\n'. |
|
| 353 | 353 | _("Installer created with software from the GEANT project."); |
| 354 | 354 | \core\common\Entity::outOfThePotatoes(); |
| 355 | 355 | return $out; |
@@ -203,8 +203,7 @@ |
||
| 203 | 203 | |
| 204 | 204 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') { |
| 205 | 205 | $configRaw['USE_OTHER_TLS_ID'] = true; |
| 206 | - } |
|
| 207 | - else { |
|
| 206 | + } else { |
|
| 208 | 207 | $configRaw['USE_OTHER_TLS_ID'] = false; |
| 209 | 208 | } |
| 210 | 209 | |
