Passed
Push — release_2_1 ( 007f3d...3ea6a4 )
by Tomasz
09:51
created
core/DeviceXMLmain.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
                 $node->appendChild($childNode);
212 212
             }
213 213
             if (!empty($namespace)) {
214
-                $ns = $domElement->createAttributeNS(null,'xmlns');
214
+                $ns = $domElement->createAttributeNS(null, 'xmlns');
215 215
                 $ns->value = $namespace;
216 216
                 $childNode->appendChild($ns);  
217 217
             }
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
                 $nextChild = $domElement->createElement($nameC, $cl);    
239 239
                 $childNode->appendChild($nextChild);
240 240
                 if (!empty($namespaceC)) {
241
-                    $ns = $domElement->createAttributeNS(null,'xmlns');
241
+                    $ns = $domElement->createAttributeNS(null, 'xmlns');
242 242
                     $ns->value = $namespaceC;
243 243
                     $nextChild->appendChild($ns);  
244 244
                 }
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
                             $childNode->appendChild($nextChild);
261 261
                         }
262 262
                         if (!empty($namespaceC)) {
263
-                            $ns = $domElement->createAttributeNS(null,'xmlns');
263
+                            $ns = $domElement->createAttributeNS(null, 'xmlns');
264 264
                             $ns->value = $namespaceC;
265 265
                             $nextChild->appendChild($ns);  
266 266
                         }
Please login to merge, or discard this patch.
config/ConfAssistant-template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                     ], 
91 91
                 'condition' => TRUE],
92 92
             'OpenRoaming® (%REALM%)' => [
93
-                'ssid' => [],     /* OpenRoaming has left SSIDs behind */
93
+                'ssid' => [], /* OpenRoaming has left SSIDs behind */
94 94
                 'oi' => [
95 95
                     '5A03BA0000', /* OpenRoaming/AllIdentities/SettlementFree/NoPersonalData/BaselineQoS */
96 96
                     '5A03BA0800', /* OpenRoaming/EduIdentities/SettlementFree/NoPersonalData/BaselineQoS */
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
         'makensis' => 'makensis',
156 156
         'zip' => 'zip',
157 157
         'trust-store-mozilla' => '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
158
-        'trust-store-custom' => __DIR__ . "/known-roots.pem",
158
+        'trust-store-custom' => __DIR__."/known-roots.pem",
159 159
     ];
160 160
 
161 161
     /**
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
             'db' => 'radacct',
194 194
             'user' => 'someuser',
195 195
             'pass' => 'somepass',
196
-            'readonly' => TRUE,],
196
+            'readonly' => TRUE, ],
197 197
         'RADIUS_2' => [
198 198
             'host' => 'auth-2.hosted.eduroam.org',
199 199
             'db' => 'radacct',
200 200
             'user' => 'someuser',
201 201
             'pass' => 'somepass',
202
-            'readonly' => TRUE,],
202
+            'readonly' => TRUE, ],
203 203
     ];
204 204
 
205 205
     /**
Please login to merge, or discard this patch.
devices/linux/DeviceLinuxSh.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
devices/linux/DeviceLinux.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     public function writeInstaller() {
61 61
         $installerPath = $this->installerBasename.".py";
62 62
         $this->copyFile("main.py", $installerPath);
63
-        $installer = fopen($installerPath,"a");
63
+        $installer = fopen($installerPath, "a");
64 64
         if ($installer === FALSE) {
65 65
             throw new Exception("Unable to open installer file for writing!");
66 66
         }
@@ -202,11 +202,11 @@  discard block
 block discarded – undo
202 202
            $config['user_realm'] = $this->attributes['internal:realm'][0];
203 203
         }
204 204
         
205
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
205
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
206 206
             $configRaw['hint_user_input'] = "True";
207 207
         }
208 208
         
209
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
209
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
210 210
             $configRaw['verify_user_realm_input'] = "True";
211 211
         }
212 212
         
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
             }
280 280
             $out .= "'DNS:$oneServer'";
281 281
         }
282
-        return "[".$out. "]";
282
+        return "[".$out."]";
283 283
     }
284 284
 
285 285
     /**
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
      * 
320 320
      * @return string
321 321
      */
322
-    private function mkCAfile(){
322
+    private function mkCAfile() {
323 323
         $out = '';
324 324
         $cAlist = $this->attributes['internal:CAs'][0];
325 325
         foreach ($cAlist as $oneCa) {
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
      */
336 336
     private function mkIntro() {
337 337
         \core\common\Entity::intoThePotatoes();
338
-        $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n' .
338
+        $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'.
339 339
             _("Installer created with software from the GEANT project.");
340 340
         \core\common\Entity::outOfThePotatoes();
341 341
         return $out;
Please login to merge, or discard this patch.
web/admin/inc/profileAutodetectCA.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
  */
21 21
 ?>
22 22
 <?php
23
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
23
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
24 24
 
25 25
 $auth = new \web\lib\admin\Authentication();
26 26
 $languageInstance = new \core\common\Language();
Please login to merge, or discard this patch.
web/admin/overview_user.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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->nomenclatureParticipant) . "</h3>";
97
+        $helptext = "<h3 style='display:inline;'>".sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureParticipant)."</h3>";
98 98
     } else {
99 99
         $helptext = "";
100 100
     }
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
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 = [];
@@ -196,14 +196,14 @@  discard block
 block discarded – undo
196 196
                         <td>
197 197
                             <?php
198 198
                             if ($blessedUser && \config\Master::DB['INST']['readonly'] === FALSE) {
199
-                                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>";
199
+                                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>";
200 200
                             }
201 201
                             ?>
202 202
                         </td>
203 203
                         <td> <!-- danger zone --> 
204 204
 
205 205
                             <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
206
-                                <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->nomenclatureParticipant, $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>
206
+                                <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->nomenclatureParticipant, $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>
207 207
                             </form>
208 208
                             <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
209 209
                                 <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>
@@ -218,18 +218,18 @@  discard block
 block discarded – undo
218 218
         </table>
219 219
         <?php
220 220
     } else {
221
-        echo "<h2>" . sprintf(_("You are not managing any %s."), $uiElements->nomenclatureParticipant) . "</h2>";
221
+        echo "<h2>".sprintf(_("You are not managing any %s."), $uiElements->nomenclatureParticipant)."</h2>";
222 222
     }
223 223
     if (\config\Master::DB['INST']['readonly'] === FALSE) {
224 224
         if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL) {
225
-            echo "<p>" . sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant) . "</p>";
225
+            echo "<p>".sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant)."</p>";
226 226
             echo "<hr/>
227 227
              <div style='white-space: nowrap;'>
228 228
                 <form action='action_enrollment.php' method='get' accept-charset='UTF-8'>" .
229
-            sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant) .
229
+            sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant).
230 230
             "        <input type='text' id='token' name='token'/>
231 231
                     <button type='submit'>" .
232
-            _("Go!") . "
232
+            _("Go!")."
233 233
                     </button>
234 234
                 </form>
235 235
              </div>";
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
             <div style='white-space: nowrap;'>
239 239
         <form action='action_enrollment.php' method='get'><button type='submit' accept-charset='UTF-8'>
240 240
                 <input type='hidden' id='token' name='token' value='SELF-REGISTER'/>" .
241
-            sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant) . "
241
+            sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant)."
242 242
             </button>
243 243
         </form>
244 244
         </div>";
Please login to merge, or discard this patch.
devices/eap_config/DeviceXML.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
         $dom = new \DOMDocument('1.0', 'utf-8');
145 145
         $root = $dom->createElement($rootname);
146 146
         $dom->appendChild($root);
147
-        $ns = $dom->createAttributeNS( 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation' );
147
+        $ns = $dom->createAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation');
148 148
         $ns->value = "eap-metadata.xsd";
149 149
         $root->appendChild($ns);
150 150
         $this->openRoamingToU = sprintf(_("I have read and agree to OpenRoaming Terms of Use at %s."), "https://wballiance.com/openroaming/toc-2020/");
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
                 if ($netDefinition['condition'] === 'internal:openroaming' &&
182 182
                         $this->attributes['internal:openroaming']) {
183 183
                     $this->setORtou();
184
-                    if (preg_match("/^ask/",$this->attributes['media:openroaming'][0])) {
184
+                    if (preg_match("/^ask/", $this->attributes['media:openroaming'][0])) {
185 185
                         $orNetwork = $netDefinition;
186 186
                         continue;                        
187 187
                     }
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
     }
239 239
     
240 240
     private function setORtou() {
241
-        if (preg_match("/preagreed/",$this->attributes['media:openroaming'][0])) {
241
+        if (preg_match("/preagreed/", $this->attributes['media:openroaming'][0])) {
242 242
             $this->addORtou = false;
243 243
         } else {
244 244
             $this->addORtou = true;
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
         $authMethods = new \core\DeviceXMLmain();
263 263
         $authMethods->setChild('AuthenticationMethod', $this->authMethodsList);
264 264
         $eapIdp->setChild('AuthenticationMethods', $authMethods);
265
-        $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids,$oids));
265
+        $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids, $oids));
266 266
 // TODO   $eap_idp->setChild('ValidUntil',$this->getValidUntil());
267 267
         $eapIdp->setChild('ProviderInfo', $this->providerInfo);
268 268
 // TODO   $eap_idp->setChild('VendorSpecific',$this->getVendorSpecific());
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
                 $lng = $lngAttr['lang'] === 'any' ? \config\Master::APPEARANCE['defaultlocale'] : $lngAttr['lang'];
417 417
                 $tou .= "\n".$this->openRoamingToUArray[$lng];
418 418
                 $touObj->setValue($tou);
419
-                $out[] =  $touObj;
419
+                $out[] = $touObj;
420 420
             } 
421 421
         } else {
422 422
             $tou = $standardTou[0];
Please login to merge, or discard this patch.
web/admin/inc/deploymentStats.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * ******************************************************************************
10 10
  */
11 11
 
12
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
12
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
13 13
 
14 14
 $auth = new \web\lib\admin\Authentication();
15 15
 $auth->authenticate();
@@ -37,21 +37,21 @@  discard block
 block discarded – undo
37 37
 ?>
38 38
 
39 39
 <h1><?php $tablecaption = _("Deployment Usage Records"); echo $tablecaption; ?></h1>
40
-<p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p>
40
+<p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p>
41 41
 <table class='authrecord'>
42
-    <caption><?php echo $tablecaption;?></caption>
42
+    <caption><?php echo $tablecaption; ?></caption>
43 43
     <tr>
44
-        <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th>
45
-        <th scope="col"><strong><?php echo _("Realm");?></strong></th>
46
-        <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
47
-        <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th>
48
-        <th scope="col"><strong><?php echo _("Result");?></strong></th>
49
-        <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th>
44
+        <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th>
45
+        <th scope="col"><strong><?php echo _("Realm"); ?></strong></th>
46
+        <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
47
+        <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th>
48
+        <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
49
+        <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th>
50 50
     </tr>
51 51
     <?php
52 52
     $userAuthData = $deployment->retrieveStatistics($backlogTime);
53 53
     foreach ($userAuthData as $oneRecord) {
54
-        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>"
54
+        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>"
55 55
                 . "<td>".$oneRecord['activity_time']."</td>"
56 56
                 // $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here
57 57
                 . "<td>".$oneRecord['realm']."</td>"
Please login to merge, or discard this patch.
core/DeploymentManaged.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
                 $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id;
291 291
             }
292 292
             if ($clients > $maxSupportedClients * 0.9) {
293
-                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!");
293
+                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!");
294 294
             }
295 295
         }
296 296
         if (count($serverCandidates) == 0 && $federation != "DEFAULT") {
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
             $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND)";
330 330
             $conditional2 = "";
331 331
         }
332
-        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName );
332
+        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName);
333 333
         return mysqli_fetch_all($stats, \MYSQLI_ASSOC);
334 334
     }
335 335
         
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
     {
447 447
         $customAttrib = $this->getAttributes("managedsp:operatorname");
448 448
         if (count($customAttrib) == 0) {
449
-            return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
449
+            return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix'];
450 450
         }
451 451
         return $customAttrib[0]["value"];
452 452
     }
@@ -462,13 +462,13 @@  discard block
 block discarded – undo
462 462
     {
463 463
 
464 464
         $hostname = "radius_hostname_$idx";
465
-        $ch = curl_init("http://" . $this->$hostname);
465
+        $ch = curl_init("http://".$this->$hostname);
466 466
         if ($ch === FALSE) {
467 467
             $res = 'FAILURE';
468 468
         } else {
469 469
             curl_setopt($ch, CURLOPT_POST, 1);
470 470
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
471
-            $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $post\n");
471
+            $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $post\n");
472 472
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
473 473
             curl_setopt($ch, CURLOPT_HEADER, 0);
474 474
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -507,19 +507,19 @@  discard block
 block discarded – undo
507 507
         } else {
508 508
             $txt = $remove ? _('Profile deactivation failed') : _('Profile activation/modification failed');
509 509
         }
510
-        $txt = $txt . ' ';
510
+        $txt = $txt.' ';
511 511
         if (array_count_values($response)[$status] == 2) {
512
-            $txt = $txt . _('on both RADIUS servers: primary and backup') . '.';
512
+            $txt = $txt._('on both RADIUS servers: primary and backup').'.';
513 513
         } else {
514 514
             if ($response['res[1]'] == $status) {
515
-                $txt = $txt . _('on primary RADIUS server') . '.';
515
+                $txt = $txt._('on primary RADIUS server').'.';
516 516
             } else {
517
-                $txt = $txt . _('on backup RADIUS server') . '.';
517
+                $txt = $txt._('on backup RADIUS server').'.';
518 518
             }
519 519
         }
520 520
         $mail = \core\common\OutsideComm::mailHandle();
521 521
         $email = $this->getAttributes("support:email")[0]['value'];
522
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
522
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
523 523
         $mail->addAddress($email);
524 524
         if ($status == 'OK') {
525 525
             $mail->Subject = _('RADIUS profile update problem fixed');
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
             return NULL;
554 554
         }
555 555
         $timeout = 10;
556
-        curl_setopt($ch, CURLOPT_URL, 'http://' . $host);
556
+        curl_setopt($ch, CURLOPT_URL, 'http://'.$host);
557 557
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
558 558
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
559 559
         curl_exec($ch);
@@ -645,33 +645,33 @@  discard block
 block discarded – undo
645 645
     {
646 646
         $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1;
647 647
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
648
-        $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&';
648
+        $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&';
649 649
         if ($remove) {
650
-            $toPostTemplate = $toPostTemplate . 'remove=1&';
650
+            $toPostTemplate = $toPostTemplate.'remove=1&';
651 651
         } else {
652
-            $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getOperatorName() . '&'; 
652
+            $toPostTemplate = $toPostTemplate.'operatorname='.$this->getOperatorName().'&'; 
653 653
             if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) {
654 654
                 $allRealms = $this->getAllRealms();
655 655
                 if (!empty($allRealms)) {
656
-                    $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&';
657
-                    $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&';
656
+                    $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&';
657
+                    $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&';
658 658
                 }
659 659
             }
660 660
         }
661 661
         foreach (array_keys($toPost) as $key) {
662
-            $elem = 'port' . $key;
663
-            $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem;
662
+            $elem = 'port'.$key;
663
+            $toPost[$key] = $toPostTemplate.'port='.$this->$elem;
664 664
         }
665 665
         $response = array();
666 666
         foreach ($toPost as $key => $value) {
667
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
668
-            $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
667
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
668
+            $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
669 669
         }
670 670
         if ($onlyone) {
671
-            $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK;
671
+            $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK;
672 672
         }
673 673
         foreach (array('OK', 'FAILURE') as $status) {
674
-            if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) {
674
+            if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) {
675 675
                 $this->sendMailtoAdmin($remove, $response, $status);
676 676
             }
677 677
         }
Please login to merge, or discard this patch.