GEANT / CAT

core/diag/Logopath.php

Spacing +15 added lines, -15 removed lines

@@ -118,11 +118,11 @@ 
         $this->possibleFailureReasons = $_SESSION["SUSPECTS"] ?? []; // if we know nothing, don't talk to anyone
         $this->additionalFindings = $_SESSION["EVIDENCE"] ?? [];
 
-        $this->subjectPrefix = _("[eduroam Diagnostics]") . " ";
+        $this->subjectPrefix = _("[eduroam Diagnostics]")." ";
         $this->finalGreeting = "\n"
                 . _("(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 cat-devel@lists.geant.org, forwarding the entire message (including the 'SUSPECTS' and 'EVIDENCE' data at the end), and explain why this is a false positive.)")
                 . "\n"
-                . _("Yours sincerely,") . "\n"
+                . _("Yours sincerely,")."\n"
                 . "\n"
                 . _("Ed U. Roam, the eduroam diagnostics algorithm");
 
@@ -133,13 +133,13 @@ 
                 "bcc" => [],
                 "reply-to" => [Logopath::EDUROAM_OT],
                 "subject" => _("[POLICYVIOLATION NATIONAL] IdP with no entry in eduroam database"),
-                "body" => _("Dear NRO administrator,") . "\n"
+                "body" => _("Dear NRO administrator,")."\n"
                 . "\n"
-                . 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"
+                . 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"
                 . "\n"
-                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.") . "\n"
+                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.")."\n"
                 . "\n"
-                . _("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"
+                . _("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"
                 . "\n"
                 . _("Please stop the policy violation ASAP by listing the IdP which is associated to this realm.")
                 . "\n",
@@ -150,11 +150,11 @@ 
                 "bcc" => [],
                 "reply-to" => [Logopath::TARGET_ENDUSER],
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
-                "body" => _("Dear IdP administrator,") . "\n"
+                "body" => _("Dear IdP administrator,")."\n"
                 . "\n"
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM']) 
                 . "\n"
-                . _("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"
+                . _("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"
                 . "\n",
             ],
             Logopath::IDP_SUSPECTED_PROBLEM_INTERACTION_EVIDENCED => [
@@ -163,11 +163,11 @@ 
                 "bcc" => [],
                 "reply-to" => [Logopath::TARGET_ENDUSER],
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
-                "body" => _("Dear IdP administrator,") . "\n"
+                "body" => _("Dear IdP administrator,")."\n"
                 . "\n"
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM']) 
                 . "\n"
-                . _("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"
+                . _("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"
                 . "\n",
             ],
         ];
@@ -175,13 +175,13 @@ 
         // add exalted human-readable information to main mail body
         foreach ($this->mailStack as $oneEntry)
         if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
-            $oneEntry .= _("Authentication/Attempt Timestamp of user session:") ." ".$this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP']."\n";
+            $oneEntry .= _("Authentication/Attempt Timestamp of user session:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP']."\n";
         }
         if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_MAC'])) {
-            $oneEntry .= _("MAC address of end user in question:") ." ".$this->additionalFindings['INTERACTIVE_ENDUSER_MAC']."\n";
+            $oneEntry .= _("MAC address of end user in question:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_MAC']."\n";
         }
         if (isset($this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS'])) {
-            $oneEntry .= _("Additional Comments:") ." ".$this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS']."\n";
+            $oneEntry .= _("Additional Comments:")." ".$this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS']."\n";
         }
         
         
@@ -246,7 +246,7 @@ 
         if (in_array(AbstractTest::INFRA_IDP_ADMIN_DETERMINED_FORCED, $this->possibleFailureReasons)) {
             $this->mailQueue[] = Logopath::IDP_SUSPECTED_PROBLEM_INTERACTIVE_FORCED;
         }
-        if(in_array($needle, $haystack))
+        if (in_array($needle, $haystack))
 // after collecting all the conditions, find the target entities in all
 // the mails, and check if they resolve to a known mail address. If they
 // do not, this triggers more mails about missing contact info.
@@ -352,7 +352,7 @@ 
 
             $handle = \core\common\OutsideComm::mailHandle();
             // let's identify outselves
-            $handle->FromName = \config\Master::APPEARANCE['productname'] . " Real-Time Diagnostics System";
+            $handle->FromName = \config\Master::APPEARANCE['productname']." Real-Time Diagnostics System";
             // add recipients
             foreach (Logopath::CATEGORYBINDING as $arrayName => $functionName) {
                 foreach ($theMail[$arrayName] as $onePrincipal) {

Braces +6 added lines, -4 removed lines

@@ -173,10 +173,11 @@ 
         ];
         
         // add exalted human-readable information to main mail body
-        foreach ($this->mailStack as $oneEntry)
-        if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
+        foreach ($this->mailStack as $oneEntry) {
+                if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
             $oneEntry .= _("Authentication/Attempt Timestamp of user session:") ." ".$this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP']."\n";
         }
+        }
         if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_MAC'])) {
             $oneEntry .= _("MAC address of end user in question:") ." ".$this->additionalFindings['INTERACTIVE_ENDUSER_MAC']."\n";
         }
@@ -246,12 +247,13 @@ 
         if (in_array(AbstractTest::INFRA_IDP_ADMIN_DETERMINED_FORCED, $this->possibleFailureReasons)) {
             $this->mailQueue[] = Logopath::IDP_SUSPECTED_PROBLEM_INTERACTIVE_FORCED;
         }
-        if(in_array($needle, $haystack))
-// after collecting all the conditions, find the target entities in all
+        if(in_array($needle, $haystack)) {
+            // after collecting all the conditions, find the target entities in all
 // the mails, and check if they resolve to a known mail address. If they
 // do not, this triggers more mails about missing contact info.
 
         $abstractRecipients = [];
+        }
         foreach ($this->mailQueue as $mail) {
             $abstractRecipients = array_unique(array_merge($this->mailStack[$mail]['to'], $this->mailStack[$mail]['cc'], $this->mailStack[$mail]['bcc'], $this->mailStack[$mail]['reply-to']));
         }