Passed
Push — release_2_1 ( 007f3d...3ea6a4 )
by Tomasz
09:51
created
devices/ms/Files/geant_link.inc 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
   nsArray::Set Delete_files "GEANTLink-ARM64.msi"
93 93
   File "GEANTLink-ARM64.msi"
94 94
   IfSilent +2
95
-  MessageBox MB_OK  "<?php WindowsCommon::echoNsis( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
95
+  MessageBox MB_OK  "<?php WindowsCommon::echoNsis(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
96 96
   !insertmacro debug_cat 1 "Run GEANTLink installer"
97 97
   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress'
98 98
   ClearErrors
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
   Pop $rebootRequired
105 105
   ${Else}
106 106
   IfSilent +2
107
-  MessageBox MB_OK "<?php WindowsCommon::echoNsis( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete successfully."))?>"
107
+  MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete successfully."))?>"
108 108
   Quit
109 109
   ${EndIf}
110 110
   Cont2:
Please login to merge, or discard this patch.
core/diag/Logopath.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -117,11 +117,11 @@  discard block
 block discarded – undo
117 117
         $this->possibleFailureReasons = $_SESSION["SUSPECTS"] ?? []; // if we know nothing, don't talk to anyone
118 118
         $this->additionalFindings = $_SESSION["EVIDENCE"] ?? [];
119 119
 
120
-        $this->subjectPrefix = _("[eduroam Diagnostics]") . " ";
120
+        $this->subjectPrefix = _("[eduroam Diagnostics]")." ";
121 121
         $this->finalGreeting = "\n"
122 122
                 . _("(This service is in an early stage. We apologise if this is a false alert. If this is the case, please send an email report to [email protected], forwarding the entire message (including the 'SUSPECTS' and 'EVIDENCE' data at the end), and explain why this is a false positive.)")
123 123
                 . "\n"
124
-                . _("Yours sincerely,") . "\n"
124
+                . _("Yours sincerely,")."\n"
125 125
                 . "\n"
126 126
                 . _("Ed U. Roam, the eduroam diagnostics algorithm");
127 127
 
@@ -132,13 +132,13 @@  discard block
 block discarded – undo
132 132
                 "bcc" => [],
133 133
                 "reply-to" => [Logopath::TARGET_EDUROAM_OT],
134 134
                 "subject" => _("[POLICYVIOLATION NATIONAL] IdP with no entry in eduroam database"),
135
-                "body" => _("Dear NRO administrator,") . "\n"
135
+                "body" => _("Dear NRO administrator,")."\n"
136 136
                 . "\n"
137
-                . wordwrap(sprintf(_("an end-user requested diagnostics for realm %s. Real-time connectivity checks determined that the realm exists, but we were unable to find an IdP with that realm in the eduroam database."), $this->additionalFindings['REALM'])) . "\n"
137
+                . wordwrap(sprintf(_("an end-user requested diagnostics for realm %s. Real-time connectivity checks determined that the realm exists, but we were unable to find an IdP with that realm in the eduroam database."), $this->additionalFindings['REALM']))."\n"
138 138
                 . "\n"
139
-                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.") . "\n"
139
+                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.")."\n"
140 140
                 . "\n"
141
-                . _("Additionally, this creates operational issues. In particular, we are unable to direct end users to their IdP for further diagnosis/instructions because there are no contact points for that IdP in the database.") . "\n"
141
+                . _("Additionally, this creates operational issues. In particular, we are unable to direct end users to their IdP for further diagnosis/instructions because there are no contact points for that IdP in the database.")."\n"
142 142
                 . "\n"
143 143
                 . _("Please stop the policy violation ASAP by listing the IdP which is associated to this realm.")
144 144
                 . "\n",
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
                 "bcc" => [],
150 150
                 "reply-to" => [Logopath::TARGET_ENDUSER],
151 151
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
152
-                "body" => _("Dear IdP administrator,") . "\n"
152
+                "body" => _("Dear IdP administrator,")."\n"
153 153
                 . "\n"
154 154
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM'])
155 155
                 . "\n"
156
-                . _("Real-time connectivity checks determined that the realm appears to be working in acceptable parameters, but the administrator insisted to contact you with the supplemental information below.") . "\n"
156
+                . _("Real-time connectivity checks determined that the realm appears to be working in acceptable parameters, but the administrator insisted to contact you with the supplemental information below.")."\n"
157 157
                 . "\n",
158 158
             ],
159 159
             Logopath::IDP_SUSPECTED_PROBLEM_INTERACTIVE_EVIDENCED => [
@@ -162,11 +162,11 @@  discard block
 block discarded – undo
162 162
                 "bcc" => [],
163 163
                 "reply-to" => [Logopath::TARGET_ENDUSER],
164 164
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
165
-                "body" => _("Dear IdP administrator,") . "\n"
165
+                "body" => _("Dear IdP administrator,")."\n"
166 166
                 . "\n"
167 167
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM'])
168 168
                 . "\n"
169
-                . _("Real-time connectivity checks determined that the realm indeed has an operational problem at this point in time. Please see the supplemental information below.") . "\n"
169
+                . _("Real-time connectivity checks determined that the realm indeed has an operational problem at this point in time. Please see the supplemental information below.")."\n"
170 170
                 . "\n",
171 171
             ],
172 172
         ];
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
         // add exalted human-readable information to main mail body
175 175
         foreach ($this->mailStack as $oneEntry) {
176 176
             if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
177
-                $oneEntry["body"] .= _("Authentication/Attempt Timestamp of user session:") . " " . $this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'] . "\n";
177
+                $oneEntry["body"] .= _("Authentication/Attempt Timestamp of user session:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP']."\n";
178 178
             }
179 179
             if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_MAC'])) {
180
-                $oneEntry["body"] .= _("MAC address of end user in question:") . " " . $this->additionalFindings['INTERACTIVE_ENDUSER_MAC'] . "\n";
180
+                $oneEntry["body"] .= _("MAC address of end user in question:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_MAC']."\n";
181 181
             }
182 182
             if (isset($this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS'])) {
183
-                $oneEntry["body"] .= _("Additional Comments:") . " " . $this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS'] . "\n";
183
+                $oneEntry["body"] .= _("Additional Comments:")." ".$this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS']."\n";
184 184
             }
185 185
         }
186 186
 
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 
345 345
             $handle = \core\common\OutsideComm::mailHandle();
346 346
             // let's identify ourselves
347
-            $handle->FromName = \config\Master::APPEARANCE['productname'] . " Real-Time Diagnostics System";
347
+            $handle->FromName = \config\Master::APPEARANCE['productname']." Real-Time Diagnostics System";
348 348
             // add recipients
349 349
             foreach (Logopath::CATEGORYBINDING as $arrayName => $functionName) {
350 350
                 foreach ($theMail[$arrayName] as $onePrincipal) {
Please login to merge, or discard this patch.
web/admin/overview_certificates.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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();
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     $feds = $user->getAttributes("user:fedadmin");
71 71
     foreach ($feds as $oneFed) {
72 72
         $theFed = new \core\Federation($oneFed['value']);
73
-        printf("<p>" . _("Certificate Information for %s %s"), $uiElements->nomenclatureFed, $theFed->name) . "</p>";
73
+        printf("<p>"._("Certificate Information for %s %s"), $uiElements->nomenclatureFed, $theFed->name)."</p>";
74 74
         foreach ($theFed->listTlsCertificates() as $oneCert) {
75 75
             if ($oneCert['STATUS'] == "REQUESTED") {
76 76
                 $theFed->updateCertificateStatus($oneCert['REQSERIAL']);
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
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
             echo "<tr>";
84
-            echo "<td>" . $oneCert['REQSERIAL'] . "</td><td>" . $oneCert['DN'] . "</td><td>" . $status . "</td><td>" . $oneCert['EXPIRY'] . "</td>";
84
+            echo "<td>".$oneCert['REQSERIAL']."</td><td>".$oneCert['DN']."</td><td>".$status."</td><td>".$oneCert['EXPIRY']."</td>";
85 85
             if ($status == "ISSUED") {
86 86
                 ?>
87 87
             <td>
88 88
                 <form action='inc/showCert.inc.php' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8' method="POST">
89
-                    <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT'];?>"/>
89
+                    <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT']; ?>"/>
90 90
                 <button type="submit">Display</button>
91 91
                 </form>
92 92
             <td>
Please login to merge, or discard this patch.
web/admin/inc/showCert.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/lib/user/Gui.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,10 +61,10 @@
 block discarded – undo
61 61
         header("Content-Type:text/html;charset=utf-8");
62 62
         ?>
63 63
         <!DOCTYPE html>
64
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>>
65
-          <head lang='<?php echo $ourlocale;?>'>
64
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>>
65
+          <head lang='<?php echo $ourlocale; ?>'>
66 66
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
67
-          <title><?php echo htmlspecialchars($pagetitle);?></title>
67
+          <title><?php echo htmlspecialchars($pagetitle); ?></title>
68 68
           <script type="text/javascript">ie_version = 0;</script>
69 69
 <!--[if IE]>
70 70
 <script type="text/javascript">ie_version=1;</script>
Please login to merge, or discard this patch.
web/admin/inc/overview_js.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
     $langInstance = new core\common\Language();
70 70
     $end = $langInstance->rtl ? "left" : "right";
71 71
     ?>
72
-    pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>');
72
+    pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>');
73 73
     }
74 74
     );
75 75
     }
Please login to merge, or discard this patch.
web/skins/modern/user/cat_info.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
          " . $Tou['title'] . "
52 52
     </h1>
53 53
 <div id='tou_1'>" . $Tou['subtitle'] .
54
-               '<div style="direction:ltr">' . $Tou['short'] . "</div>
54
+                '<div style="direction:ltr">' . $Tou['short'] . "</div>
55 55
 </div>
56 56
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
57 57
 <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
  * the receiving end to strip this marker and not add the title by itself.
32 32
  *
33 33
  */
34
-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
34
+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
35 35
 
36 36
 $Gui = new \web\lib\user\Gui();
37 37
 
@@ -41,46 +41,46 @@  discard block
 block discarded – undo
41 41
 $subpage = $_REQUEST['subpage'];
42 42
 switch ($page) {
43 43
     case 'about':
44
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
44
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
45 45
         $out = "<div class='padding'>$out</div>";
46 46
         break;
47 47
     case 'tou':
48
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
48
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
49 49
         $out = "no_title<div>
50 50
            <h1>
51
-         " . $Tou['title'] . "
51
+         " . $Tou['title']."
52 52
     </h1>
53
-<div id='tou_1'>" . $Tou['subtitle'] .
54
-               '<div style="direction:ltr">' . $Tou['short'] . "</div>
53
+<div id='tou_1'>" . $Tou['subtitle'].
54
+               '<div style="direction:ltr">'.$Tou['short']."</div>
55 55
 </div>
56 56
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
57 57
 <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .
58
-                $Tou['full'] . "
58
+                $Tou['full']."
59 59
 </div>
60 60
 </div>
61 61
 ";
62 62
         break;
63 63
     case 'help':
64
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
64
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
65 65
         switch ($subpage) {
66 66
             case 'contact':
67 67
             case 'idp_not_listed':
68 68
             case 'device_not_listed':
69 69
             case 'what_is_eduroam':
70
-                $out = "no_title<div><h1>" . _("Help") . "</h1>";
70
+                $out = "no_title<div><h1>"._("Help")."</h1>";
71 71
                 foreach ($Faq as $faqItem) {
72 72
                     if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
73
-                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
74
-                        $out .= "" . $faqItem['text'] . "</div>\n";
73
+                        $out .= "<div><h3>".$faqItem['title']."</h3>\n";
74
+                        $out .= "".$faqItem['text']."</div>\n";
75 75
                     }
76 76
                 }
77 77
                 $out .= "</div>";
78 78
                 break;
79 79
             case 'faq':
80
-                $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
80
+                $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
81 81
                 foreach ($Faq as $faqItem) {
82
-                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
83
-                    $out .= "" . $faqItem['text'] . "</div>\n";
82
+                    $out .= "<div><h3>".$faqItem['title']."</h3>\n";
83
+                    $out .= "".$faqItem['text']."</div>\n";
84 84
                 }
85 85
                 $out .= "</div>";
86 86
                 break;
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
104 104
                     $rn = uniqid();
105 105
                     $_SESSION['remindIdP'] = $rn;
106 106
                     $out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
107
-                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
108
-                    $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
109
-                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
107
+                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
108
+                    $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
109
+                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
110 110
                     $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
111 111
                     $out = "<div  class='padding'>$out</div>";
112 112
                 }
113 113
                 break;
114 114
             case 'develop':
115
-                include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
115
+                include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
116 116
                 $out = "<div class='padding'>$out</div>";
117 117
                 break;
118 118
         }
Please login to merge, or discard this patch.
core/SilverbulletCertificate.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
         $invitationObject = new SilverbulletInvitation($token);
326 326
         $profile = new ProfileSilverbullet($invitationObject->profile);
327 327
         $inst = new IdP($profile->institution);
328
-        $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
328
+        $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
329 329
         if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
330 330
             throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have got that far!");
331 331
         }
@@ -338,12 +338,12 @@  discard block
 block discarded – undo
338 338
             throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
339 339
         }
340 340
         $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
341
-        $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
341
+        $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
342 342
         $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
343 343
         if ($expiryDateObject === FALSE) {
344 344
             throw new Exception("The expiry date we got from the DB is bogus!");
345 345
         }
346
-        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
346
+        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
347 347
         // date_create with no parameters can't fail, i.e. is never FALSE
348 348
         $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
349 349
         $expiryDays = $validity->days + 1;
@@ -377,14 +377,14 @@  discard block
 block discarded – undo
377 377
         $exportedCertClear = "";
378 378
         openssl_pkcs12_export($cert, $exportedCertClear, $privateKey, "", ['extracerts' => [$issuingCaPem, $rootCaPem]]);
379 379
         $pkey_3des = "";
380
-        openssl_pkey_export($privateKey, $pkey_3des, $importPassword, [ "encrypt_key_cipher" => OPENSSL_CIPHER_3DES ]);
380
+        openssl_pkey_export($privateKey, $pkey_3des, $importPassword, ["encrypt_key_cipher" => OPENSSL_CIPHER_3DES]);
381 381
         // store resulting cert CN and expiry date in separate columns into DB - do not store the cert data itself as it contains the private key!
382 382
         // we need the *real* expiry date, not just the day-approximation
383 383
         $x509 = new \core\common\X509();
384 384
         $certString = "";
385 385
         openssl_x509_export($cert, $certString);
386 386
         $parsedCert = $x509->processCertificate($certString);
387
-        $loggerInstance->debug(5, "CERTINFO: " . /** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
387
+        $loggerInstance->debug(5, "CERTINFO: "./** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
388 388
         $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
389 389
 
390 390
         // store new cert info in DB
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
         // let the RADIUS users know the actual username for CUI generation
397 397
         $radiusDbs = DBConnection::handle("RADIUS"); // is an array of server conns
398 398
         foreach ($radiusDbs as $oneRadiusDb) {
399
-            $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId] , $csr["USERNAME"]);
399
+            $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId], $csr["USERNAME"]);
400 400
         }
401 401
 
402 402
 // return PKCS#12 data stream
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
         $username = "";
454 454
         while ($usernameIsUnique === FALSE) {
455 455
             $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
456
-            $username = $usernameLocalPart . "@" . $realm;
456
+            $username = $usernameLocalPart."@".$realm;
457 457
             $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype);
458 458
             // SELECT -> resource, not boolean
459 459
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {
Please login to merge, or discard this patch.
core/ExternalEduroamDBData.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
             return $this->counter;
127 127
         }
128 128
 
129
-        $cachedNumber = @file_get_contents(ROOT . "/var/tmp/cachedSPNumber.serialised");
129
+        $cachedNumber = @file_get_contents(ROOT."/var/tmp/cachedSPNumber.serialised");
130 130
         if ($cachedNumber !== FALSE) {
131 131
             $numberData = unserialize($cachedNumber);
132 132
             $now = new \DateTime();
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
         } else { // data in cache is too old or doesn't exist. We really need to ask the database
140 140
             $list = $this->listAllServiceProviders();
141 141
             $this->counter = count($list);
142
-            file_put_contents(ROOT . "/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
142
+            file_put_contents(ROOT."/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
143 143
             return $this->counter;
144 144
         }
145 145
     }
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         $returnarray = [];
189 189
         $query = "SELECT id_institution AS id, country, inst_realm as realmlist, name AS collapsed_name, contact AS collapsed_contact, type FROM view_active_institution WHERE country = ?";
190 190
         if ($eduroamDbType !== NULL) {
191
-            $query .= " AND ( type = '" . ExternalEduroamDBData::TYPE_IDPSP . "' OR type = '" . $eduroamDbType . "')";
191
+            $query .= " AND ( type = '".ExternalEduroamDBData::TYPE_IDPSP."' OR type = '".$eduroamDbType."')";
192 192
         }
193 193
         $externals = $this->db->exec($query, "s", $tld);
194 194
         // was a SELECT query, so a resource and not a boolean
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
         $instServerTransaction = $this->db->exec($query, "s", $tld);
292 292
         while ($instServerResponses = mysqli_fetch_object(/** @scrutinizer ignore-type */ $instServerTransaction)) {
293 293
             $contactList = $this->dissectCollapsedContacts($instServerResponses->contacts);
294
-            $retval[$instServerResponses->ROid . "-". $instServerResponses->instid] = [
294
+            $retval[$instServerResponses->ROid."-".$instServerResponses->instid] = [
295 295
                 "names" => $this->splitNames($instServerResponses->inst_name),
296 296
                 "type" => array_search($instServerResponses->type, self::TYPE_MAPPING),
297 297
                 "servers" => $instServerResponses->servers,
Please login to merge, or discard this patch.