@@ -150,8 +150,8 @@ discard block |
||
150 | 150 | <td> |
151 | 151 | <?php |
152 | 152 | echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
153 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
154 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
153 | + "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
154 | + "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
155 | 155 | ?> |
156 | 156 | </td> |
157 | 157 | </tr> |
@@ -173,8 +173,8 @@ discard block |
||
173 | 173 | <td> |
174 | 174 | <?php |
175 | 175 | echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
176 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
177 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
176 | + "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
177 | + "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
178 | 178 | ?> |
179 | 179 | </td> |
180 | 180 | </tr> |
@@ -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->nomenclatureHotspot)); |
@@ -102,21 +102,21 @@ discard block |
||
102 | 102 | <?php |
103 | 103 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) { |
104 | 104 | echo "<tr> |
105 | - <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"),$uiElements->nomenclatureInst) . "</td> |
|
105 | + <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"), $uiElements->nomenclatureInst)."</td> |
|
106 | 106 | <td><form method='post' action='../diag/action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'> |
107 | 107 | <!--<input type='text' name='realm' id='realm'>--> |
108 | 108 | <input type='hidden' name='comefrom' id='comefrom' value='$link'/> |
109 | - <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button> |
|
109 | + <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button> |
|
110 | 110 | </form> |
111 | 111 | </td> |
112 | 112 | </tr>"; |
113 | 113 | } |
114 | 114 | if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam") { // SW: APPROVED |
115 | 115 | echo "<tr> |
116 | - <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed) . "</td> |
|
116 | + <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed)."</td> |
|
117 | 117 | <td> |
118 | 118 | <form action='https://monitor.eduroam.org/mon_direct.php' accept-charset='UTF-8'> |
119 | - <button style='cursor:pointer;' type='submit'>" . _("Go!") . "</button> |
|
119 | + <button style='cursor:pointer;' type='submit'>" . _("Go!")."</button> |
|
120 | 120 | </form> |
121 | 121 | </td> |
122 | 122 | </tr>"; |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | <?php |
128 | 128 | $hotspotProfiles = $my_inst->listDeployments(); |
129 | 129 | if (count($hotspotProfiles) == 0) { // no profiles yet. |
130 | - echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>"; |
|
130 | + echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>"; |
|
131 | 131 | } |
132 | 132 | if (count($hotspotProfiles) > 0) { // no profiles yet. |
133 | - echo "<h2>" . sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot) . "</h2>"; |
|
133 | + echo "<h2>".sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot)."</h2>"; |
|
134 | 134 | // display an info box with the connection data |
135 | 135 | } |
136 | 136 | |
@@ -149,19 +149,19 @@ discard block |
||
149 | 149 | ?> |
150 | 150 | <div style='display: table-row; margin-bottom: 20px;'> |
151 | 151 | <div class='profilebox' style='display: table-cell;'> |
152 | - <h2><?php echo core\DeploymentManaged::PRODUCTNAME . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2> |
|
152 | + <h2><?php echo core\DeploymentManaged::PRODUCTNAME." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2> |
|
153 | 153 | <table> |
154 | 154 | <tr> |
155 | 155 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
156 | 156 | <?php |
157 | 157 | if ($deploymentObject->host1_v4 !== NULL) { |
158 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
158 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
159 | 159 | } |
160 | 160 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
161 | 161 | echo "<br/>"; |
162 | 162 | } |
163 | 163 | if ($deploymentObject->host1_v6 !== NULL) { |
164 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
164 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
165 | 165 | } |
166 | 166 | ?> |
167 | 167 | </td> |
@@ -169,9 +169,9 @@ discard block |
||
169 | 169 | <td><?php echo $deploymentObject->port1; ?></td> |
170 | 170 | <td> |
171 | 171 | <?php |
172 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
173 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
174 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
172 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
173 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
174 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>"; |
|
175 | 175 | ?> |
176 | 176 | </td> |
177 | 177 | </tr> |
@@ -179,22 +179,22 @@ discard block |
||
179 | 179 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
180 | 180 | <?php |
181 | 181 | if ($deploymentObject->host2_v4 !== NULL) { |
182 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
182 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
183 | 183 | } |
184 | 184 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
185 | 185 | echo "<br/>"; |
186 | 186 | } |
187 | 187 | if ($deploymentObject->host2_v6 !== NULL) { |
188 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
188 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
189 | 189 | } |
190 | 190 | ?></td> |
191 | 191 | <td><?php echo _("RADIUS port number: ") ?></td> |
192 | 192 | <td><?php echo $deploymentObject->port2; ?></td> |
193 | 193 | <td> |
194 | 194 | <?php |
195 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
196 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
197 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
195 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
196 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
197 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>"; |
|
198 | 198 | ?> |
199 | 199 | </td> |
200 | 200 | </tr> |
@@ -245,12 +245,12 @@ discard block |
||
245 | 245 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
246 | 246 | echo '<br>'; |
247 | 247 | if ($res['FAILURE'] == 2) { |
248 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
248 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
249 | 249 | } else { |
250 | 250 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
251 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
251 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
252 | 252 | } else { |
253 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
253 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
254 | 254 | } |
255 | 255 | } |
256 | 256 | } |
@@ -270,12 +270,12 @@ discard block |
||
270 | 270 | if ($res['FAILURE'] > 0) { |
271 | 271 | echo '<br>'; |
272 | 272 | if ($res['FAILURE'] == 2) { |
273 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
273 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
274 | 274 | } else { |
275 | 275 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
276 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
276 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
277 | 277 | } else { |
278 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
278 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
279 | 279 | } |
280 | 280 | } |
281 | 281 | } |
@@ -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) { |
@@ -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 |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $installerPath = $this->installerBasename.".sh"; |
52 | 52 | $this->copyFile("eduroam_linux_main.sh", $installerPath); |
53 | 53 | |
54 | - if ( !file_exists($installerPath) ) { |
|
54 | + if (!file_exists($installerPath)) { |
|
55 | 55 | throw new Exception('File not found.'); |
56 | 56 | } |
57 | 57 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | fwrite($installer, 'printf -v INIT_CONFIRMATION "$INIT_CONFIRMATION_TMP" "$ORGANISATION"'."\n\n"); |
69 | 69 | fwrite($installer, 'main "$@"; exit'."\n"); |
70 | 70 | } catch (Exception $e) { |
71 | - echo 'Error message: ' .$e->getMessage(); |
|
71 | + echo 'Error message: '.$e->getMessage(); |
|
72 | 72 | } finally { |
73 | 73 | fclose($installer); |
74 | 74 | return($installerPath); |
@@ -204,11 +204,11 @@ discard block |
||
204 | 204 | $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
205 | 205 | } |
206 | 206 | |
207 | - if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
207 | + if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
208 | 208 | $configRaw['HINT_USER_INPUT'] = true; |
209 | 209 | } |
210 | 210 | |
211 | - if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
211 | + if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
212 | 212 | $configRaw['VERIFY_USER_REALM_INPUT'] = true; |
213 | 213 | } else { |
214 | 214 | $configRaw['VERIFY_USER_REALM_INPUT'] = false; |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | } |
220 | 220 | |
221 | 221 | foreach ($configRaw as $name => $value) { |
222 | - fwrite($file, $name ."=". $value."\n"); |
|
222 | + fwrite($file, $name."=".$value."\n"); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | if ($tou === '') { |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | } |
284 | 284 | $out .= "'DNS:$oneServer'"; |
285 | 285 | } |
286 | - return "(".$out. ")"; |
|
286 | + return "(".$out.")"; |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | /** |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | * |
324 | 324 | * @return string |
325 | 325 | */ |
326 | - private function mkCAfile(){ |
|
326 | + private function mkCAfile() { |
|
327 | 327 | $out = ''; |
328 | 328 | $cAlist = $this->attributes['internal:CAs'][0]; |
329 | 329 | foreach ($cAlist as $oneCa) { |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | */ |
340 | 340 | private function mkIntro() { |
341 | 341 | \core\common\Entity::intoThePotatoes(); |
342 | - $out = _("This installer has been prepared for %s").'\n\n'._("More information and comments:").'\n\nE-Mail: %s\nWWW: %s\n\n' . |
|
342 | + $out = _("This installer has been prepared for %s").'\n\n'._("More information and comments:").'\n\nE-Mail: %s\nWWW: %s\n\n'. |
|
343 | 343 | _("Installer created with software from the GEANT project."); |
344 | 344 | \core\common\Entity::outOfThePotatoes(); |
345 | 345 | return $out; |
@@ -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 | $auth = new \web\lib\admin\Authentication(); |
32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | foreach ($theFed->listTlsCertificates() as $oneCert) { // fetch list a second time, in case we got a cert |
82 | 82 | $status = $oneCert['STATUS']; |
83 | 83 | if ($status == "ISSUED") { |
84 | - $status = "<span onclick='alert(\"".str_replace("\n","\\n",$oneCert['CERT'])."\");'>$status</span>"; |
|
84 | + $status = "<span onclick='alert(\"".str_replace("\n", "\\n", $oneCert['CERT'])."\");'>$status</span>"; |
|
85 | 85 | } |
86 | 86 | echo "<tr><td>".$oneCert['REQSERIAL']."</td><td>".$oneCert['DN']."</td><td>".$status."</td><td>".$oneCert['EXPIRY']."</td></tr>"; |
87 | 87 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | // realm is automatically calculated, then stored in DB |
98 | 98 | |
99 | - $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . \config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
99 | + $this->realm = "opaquehash@$myInst->identifier-$this->identifier.".strtolower($myInst->federation).\config\ConfAssistant::SILVERBULLET['realm_suffix']; |
|
100 | 100 | $localValueIfAny = ""; |
101 | 101 | |
102 | 102 | // but there's some common internal attributes populated directly |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | |
114 | 114 | // and we need to populate eap:server_name and eap:ca_file with the NRO-specific EAP information |
115 | 115 | $silverbulletAttributes = [ |
116 | - "eap:server_name" => "auth." . strtolower($myFed->tld) . \config\ConfAssistant::SILVERBULLET['server_suffix'], |
|
116 | + "eap:server_name" => "auth.".strtolower($myFed->tld).\config\ConfAssistant::SILVERBULLET['server_suffix'], |
|
117 | 117 | ]; |
118 | 118 | $temp = array_merge($this->addInternalAttributes($internalAttributes), $this->addInternalAttributes($silverbulletAttributes)); |
119 | 119 | $x509 = new \core\common\X509(); |
120 | - $caHandle = fopen(dirname(__FILE__) . "/../config/SilverbulletServerCerts/" . strtoupper($myFed->tld) . "/root.pem", "r"); |
|
120 | + $caHandle = fopen(dirname(__FILE__)."/../config/SilverbulletServerCerts/".strtoupper($myFed->tld)."/root.pem", "r"); |
|
121 | 121 | if ($caHandle !== FALSE) { |
122 | 122 | $cAFile = fread($caHandle, 16000000); |
123 | 123 | foreach ($x509->splitCertificate($cAFile) as $oneCa) { |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | if (empty($certNames)) { |
274 | 274 | return []; |
275 | 275 | } |
276 | - $namesCondensed = "'" . implode("' OR username = '", $certNames) . "'"; |
|
276 | + $namesCondensed = "'".implode("' OR username = '", $certNames)."'"; |
|
277 | 277 | $serverHandles = DBConnection::handle("RADIUS"); |
278 | 278 | $returnarray = []; |
279 | 279 | foreach ($serverHandles as $oneDbServer) { |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | $loggerInstance = new \core\common\Logging(); |
76 | 76 | $olddomain = textdomain(NULL); |
77 | 77 | $loggerInstance->debug(4, "set_locale($domain)\n"); |
78 | - $loggerInstance->debug(4, ROOT . "\n"); |
|
78 | + $loggerInstance->debug(4, ROOT."\n"); |
|
79 | 79 | textdomain($domain); |
80 | - bindtextdomain($domain, ROOT . "/translation/"); |
|
80 | + bindtextdomain($domain, ROOT."/translation/"); |
|
81 | 81 | return $olddomain; |
82 | 82 | } |
83 | 83 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | // check if this language is supported by the CAT config |
130 | 130 | foreach (\config\Master::LANGUAGES as $language => $value) { |
131 | - if (preg_match("/^" . $language . ".*/", $tryLang)) { |
|
131 | + if (preg_match("/^".$language.".*/", $tryLang)) { |
|
132 | 132 | $localeTmp = $value['locale']; |
133 | 133 | $langIndex = $language; // ??? |
134 | 134 | break; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | } |
144 | 144 | } |
145 | 145 | } |
146 | - putenv("LC_ALL=" . $theLocale); |
|
146 | + putenv("LC_ALL=".$theLocale); |
|
147 | 147 | $_SESSION['language'] = $langIndex; |
148 | 148 | $loggerInstance = new \core\common\Logging(); |
149 | 149 | $loggerInstance->debug(4, "selected lang:$langIndex:$theLocale\n"); |
@@ -88,7 +88,7 @@ |
||
88 | 88 | public function der2pem($derData) |
89 | 89 | { |
90 | 90 | $pem = chunk_split(base64_encode($derData), 64, "\n"); |
91 | - $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n"; |
|
91 | + $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n"; |
|
92 | 92 | return $pem; |
93 | 93 | } |
94 | 94 |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | private function writeToFile($filename, $message) |
51 | 51 | { |
52 | - file_put_contents(\config\Master::PATHS['logdir'] . "/$filename", sprintf("%-015s", microtime(TRUE)) . $message, FILE_APPEND); |
|
52 | + file_put_contents(\config\Master::PATHS['logdir']."/$filename", sprintf("%-015s", microtime(TRUE)).$message, FILE_APPEND); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | } else { |
82 | 82 | $output .= var_export($stuff, TRUE); |
83 | 83 | } |
84 | - $output = $prefix . $output . $suffix; |
|
84 | + $output = $prefix.$output.$suffix; |
|
85 | 85 | $this->writeToFile("debug.log", $output); |
86 | 86 | |
87 | 87 | return; |
@@ -129,6 +129,6 @@ discard block |
||
129 | 129 | $logTextStep1 = preg_replace("/[\n\r]/", "", $query); |
130 | 130 | $logTextStep2 = preg_replace("/ +/", " ", $logTextStep1); |
131 | 131 | $logTextStep3 = iconv("UTF-8", "UTF-8//IGNORE", $logTextStep2); |
132 | - $this->writeToFile("audit-SQL.log", " " . $logTextStep3 . "\n"); |
|
132 | + $this->writeToFile("audit-SQL.log", " ".$logTextStep3."\n"); |
|
133 | 133 | } |
134 | 134 | } |
135 | 135 | \ No newline at end of file |