GEANT / CAT

core/diag/Sociopath.php

Indentation +21 added lines, -21 removed lines

@@ -57,34 +57,34 @@
         $confAssistantText = _("You should use appropriate configuration assistants [MGW: see if the realm exists in CAT, then display link to config] or contact your Identity Provider [MGW: show contact info].");
         $this->qaArray = [
             0 => ["AREA" => AbstractTest::INFRA_DEVICE,
-                  "TXT" => _("Have you ever used the network succesfully, e.g. at your home institution without roaming?"),
-                  "FACTOR" => 0.5,
-                  "VERDICTLECTURE" => sprintf(_("If your device has never worked before with this setup, then very likely your device configuation is wrong. %s"), $confAssistantText)],
+                    "TXT" => _("Have you ever used the network succesfully, e.g. at your home institution without roaming?"),
+                    "FACTOR" => 0.5,
+                    "VERDICTLECTURE" => sprintf(_("If your device has never worked before with this setup, then very likely your device configuation is wrong. %s"), $confAssistantText)],
             1 => ["AREA" => AbstractTest::INFRA_DEVICE, 
-                  "TXT" => _("Did the device previously work when roaming, i.e. at other hotspots away from your home institution?"), 
-                  "FACTOR" => 0.33,
-                  "VERDICTLECTURE" => sprintf(_("If roaming consistently does not work, then very likely your device configuration is wrong. Typical errors causing this symptom include: using a routing ('outer') username without the @realm.tld suffix - those potentially work at home, but can not be used when roaming. %s"),$confAssistantText)],
+                    "TXT" => _("Did the device previously work when roaming, i.e. at other hotspots away from your home institution?"), 
+                    "FACTOR" => 0.33,
+                    "VERDICTLECTURE" => sprintf(_("If roaming consistently does not work, then very likely your device configuration is wrong. Typical errors causing this symptom include: using a routing ('outer') username without the @realm.tld suffix - those potentially work at home, but can not be used when roaming. %s"),$confAssistantText)],
             2 => ["AREA" => AbstractTest::INFRA_DEVICE, 
-                  "TXT" => _("Did you recently change the configuration on your device?"), 
-                  "FACTOR" => 3,
-                  "VERDICTLECTURE" => _("Accounts only need to be configured once, and can then be used anywhere on the planet without any changes. If you recently changed the configuration, that change may very well be at fault. You should never change your network configuration unless explicitly instructed so by your Identity Provider; even in the case of temporary login issues.")],
+                    "TXT" => _("Did you recently change the configuration on your device?"), 
+                    "FACTOR" => 3,
+                    "VERDICTLECTURE" => _("Accounts only need to be configured once, and can then be used anywhere on the planet without any changes. If you recently changed the configuration, that change may very well be at fault. You should never change your network configuration unless explicitly instructed so by your Identity Provider; even in the case of temporary login issues.")],
             3 => ["AREA" => AbstractTest::INFRA_DEVICE, 
-                  "TXT" => _("Do your other devices still work?"),
-                  "VERDICTLECTURE" => _("If all devices stopped working simultaneously, there may be a problem with your account as such. Maybe your account expired, or you were forced to change the password? These questions are best answered by your Identity Provider [MGW: display contact info]"),
-                  "FACTOR" => 0.33],
+                    "TXT" => _("Do your other devices still work?"),
+                    "VERDICTLECTURE" => _("If all devices stopped working simultaneously, there may be a problem with your account as such. Maybe your account expired, or you were forced to change the password? These questions are best answered by your Identity Provider [MGW: display contact info]"),
+                    "FACTOR" => 0.33],
             4 => ["AREA" => AbstractTest::INFRA_SP_80211, 
-                  "TXT" => _("Is the place you are currently at heavily crowded, or is a network-intensive workload going on?"), 
-                  "FACTOR" => 3,
-                  "VERDICTLECTURE" => _("The network is likely overloaded at this location and point in time. You may have to wait until later before you get a better connectivity. If you think the network should be reinforced for more capacity at this place, you should inform the hotspot provider. [MGW: add contact info]")],            
+                    "TXT" => _("Is the place you are currently at heavily crowded, or is a network-intensive workload going on?"), 
+                    "FACTOR" => 3,
+                    "VERDICTLECTURE" => _("The network is likely overloaded at this location and point in time. You may have to wait until later before you get a better connectivity. If you think the network should be reinforced for more capacity at this place, you should inform the hotspot provider. [MGW: add contact info]")],            
             5 => ["AREA" => AbstractTest::INFRA_SP_80211, 
-                  "TXT" => _("Does the connection get better when you move around?"), 
-                  "FACTOR" => 3,
-                  "VERDICTLECTURE" => _("You should move to a different location to achieve better network coverage and service. If you think the exact spot you are at deserves better coverage, you should inform the hotspot provider. [MGW: add contact info]")],
+                    "TXT" => _("Does the connection get better when you move around?"), 
+                    "FACTOR" => 3,
+                    "VERDICTLECTURE" => _("You should move to a different location to achieve better network coverage and service. If you think the exact spot you are at deserves better coverage, you should inform the hotspot provider. [MGW: add contact info]")],
             
             6 => ["AREA" => AbstractTest::INFRA_SP_LAN, 
-                  "TXT" => _("Do you see errors stating something similar to 'Unable to get IP address'?"), 
-                  "FACTOR" => 3,
-                  "VERDICTLECTURE" => _("The evidence at hand suggests that there may be an infrastructure problem at this particular hotspot provider. There is nothing you can do to solve this problem locally. Please be patient and try again at a later time.")],
+                    "TXT" => _("Do you see errors stating something similar to 'Unable to get IP address'?"), 
+                    "FACTOR" => 3,
+                    "VERDICTLECTURE" => _("The evidence at hand suggests that there may be an infrastructure problem at this particular hotspot provider. There is nothing you can do to solve this problem locally. Please be patient and try again at a later time.")],
         ];
     }
 

Spacing +8 added lines, -8 removed lines

@@ -63,7 +63,7 @@ 
             1 => ["AREA" => AbstractTest::INFRA_DEVICE, 
                   "TXT" => _("Did the device previously work when roaming, i.e. at other hotspots away from your home institution?"), 
                   "FACTOR" => 0.33,
-                  "VERDICTLECTURE" => sprintf(_("If roaming consistently does not work, then very likely your device configuration is wrong. Typical errors causing this symptom include: using a routing ('outer') username without the @realm.tld suffix - those potentially work at home, but can not be used when roaming. %s"),$confAssistantText)],
+                  "VERDICTLECTURE" => sprintf(_("If roaming consistently does not work, then very likely your device configuration is wrong. Typical errors causing this symptom include: using a routing ('outer') username without the @realm.tld suffix - those potentially work at home, but can not be used when roaming. %s"), $confAssistantText)],
             2 => ["AREA" => AbstractTest::INFRA_DEVICE, 
                   "TXT" => _("Did you recently change the configuration on your device?"), 
                   "FACTOR" => 3,
@@ -97,12 +97,12 @@ 
         $questionDetails = $this->qaArray[$questionNumber];
         if ($answer === TRUE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR"];
-            $this->loggerInstance->debug(3,"Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR"]."\n");
+            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR"] . "\n");
             $factor = $questionDetails["FACTOR"];
         } elseif ($answer === FALSE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] / $questionDetails["FACTOR"];
-            $this->loggerInstance->debug(3,"Adjusting ".$questionDetails['AREA']." by 1/".$questionDetails["FACTOR"]."\n");
-            $factor = 1/$questionDetails["FACTOR"];
+            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by 1/" . $questionDetails["FACTOR"] . "\n");
+            $factor = 1 / $questionDetails["FACTOR"];
         } else {
             $factor = 1;
         }
@@ -111,7 +111,7 @@ 
         $this->additionalFindings["QUESTIONSASKED"] = $this->previousQuestions;
         $_SESSION["SUSPECTS"] = $this->possibleFailureReasons;
         $_SESSION["EVIDENCE"] = $this->additionalFindings;
-        $this->loggerInstance->debug(3,$_SESSION['SUSPECTS']);
+        $this->loggerInstance->debug(3, $_SESSION['SUSPECTS']);
     }
     
     public function questionOracle() {
@@ -125,7 +125,7 @@ 
         // if both are identical, take any of the questions in the pool of both
         foreach ($this->qaArray as $questionNumber => $questionDetails) {
             // if we find a question we didn't ask before AND it is related to our currently high-scoring problem area, ask it
-            if (!array_key_exists($questionNumber, $this->previousQuestions) && ( $questionDetails["AREA"] == $highestCategory || $questionDetails["AREA"] == $nextCategory) ) {
+            if (!array_key_exists($questionNumber, $this->previousQuestions) && ($questionDetails["AREA"] == $highestCategory || $questionDetails["AREA"] == $nextCategory)) {
                 return json_encode(["NEXTEXISTS" => TRUE, "NUMBER" => $questionNumber, "TEXT" => $questionDetails["TXT"]]);
             }
         }
@@ -134,14 +134,14 @@ 
     }
     
     public function getCurrentGuessState() {
-        return json_encode([ "SUSPECTS" => $this->possibleFailureReasons, "EVIDENCE" => $this->additionalFindings ]);
+        return json_encode(["SUSPECTS" => $this->possibleFailureReasons, "EVIDENCE" => $this->additionalFindings]);
     }
     
     public function verdictText($area) {
         $text = $this->genericVerdictTexts[$area];
         foreach ($this->previousQuestions as $number => $factor) {
             if ($this->qaArray[$number]["AREA"] == $area && $factor > 1) {
-                $text .= "\n\n".$this->qaArray[$number]["VERDICTLECTURE"];
+                $text .= "\n\n" . $this->qaArray[$number]["VERDICTLECTURE"];
             }
         }
         return $text;

core/diag/Logopath.php

Spacing +6 added lines, -6 removed lines

@@ -42,11 +42,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"
                 . _("The eduroam diagnostics algorithms");
         
@@ -57,13 +57,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."), "foo.bar")) ."\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."), "foo.bar")) . "\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.",
                 ],

web/diag/processSociopath.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     }
     $sociopath->revaluate($QPHP["NUMBER"], $yes);
 } else {
-    error_log('MGW workingwith '.serialize($workingwith));
+    error_log('MGW workingwith ' . serialize($workingwith));
 }
 $QJSON = $sociopath->questionOracle();
 $_SESSION['QJSON'] = $QJSON;

web/diag/magicTelepath.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 require_once(dirname(dirname(__DIR__)) . "/config/_config.php");
 $realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
 if (session_status != PHP_SESSION_ACTIVE) {
     session_start();
 }

web/skins/modern/diag/diag.php

Spacing +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 function my_nonce($optSalt = '') {
     $remote = filter_input(INPUT_SERVER, 'REMOTE_ADDR');
-    return hash_hmac('sha256', session_id() . $optSalt, date("YmdG") . '1qaz2wsx3edc!QAZ@WSX#EDC' .$remote);
+    return hash_hmac('sha256', session_id() . $optSalt, date("YmdG") . '1qaz2wsx3edc!QAZ@WSX#EDC' . $remote);
 }
 error_reporting(E_ALL | E_STRICT);
 $Gui->defaultPagePrelude();
 $_SESSION['current_page'] = $_SERVER['SCRIPT_NAME'];
 ?>
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js"); ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js"); ?>"></script>
-<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/Timepicker/jquery-ui-timepicker-addon.js"); ?>"></script>
-<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/Timepicker/jquery-ui-sliderAccess.js"); ?>"></script>
-<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui-1.12.1.custom/jquery-ui.css"); ?>" media="all" />
-<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/Timepicker/jquery-ui-timepicker-addon.css"); ?>"  media="all" />
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js"); ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js"); ?>"></script>
+<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/Timepicker/jquery-ui-timepicker-addon.js"); ?>"></script>
+<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/Timepicker/jquery-ui-sliderAccess.js"); ?>"></script>
+<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui-1.12.1.custom/jquery-ui.css"); ?>" media="all" />
+<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/Timepicker/jquery-ui-timepicker-addon.css"); ?>"  media="all" />
 <script type="text/javascript">
     var recognisedOS = '';
     var downloadMessage;
@@ -43,7 +43,7 @@ 
 <body>
 <div id="main_page">
     <div id="loading_ico">
-          <span id='load_comment'></span><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif"); ?>" alt="Loading stuff ..."/>
+          <span id='load_comment'></span><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Loading stuff ..."/>
     </div>
     <form id="cat_form" name="cat_form" method="POST"  accept-charset="UTF-8" action="">
     <input name="myNonce" id="myNonce" type="hidden" value="<?php echo my_nonce($_SERVER['SCRIPT_NAME']); ?>">
@@ -194,7 +194,7 @@ 
         return false;
     }
     function testSociopath(realm, susp, answer) {
-        var comment = <?php echo '"'._("Testing realm").'..."'; ?>; 
+        var comment = <?php echo '"' . _("Testing realm") . '..."'; ?>; 
         inProgress(1, comment);
         if ($('#tested_realm').length == 0) {
             $('<input>').attr({
@@ -251,7 +251,7 @@ 
         result = result + '<div><h3>';
         result = result + <?php echo '"' . _("The result for tested realm:") . ' "'; ?> + realm;
         result = result + '</h3></p><div style="padding: 5px;"><div style="padding: 0px;">';
-        result = result + <?php echo '"' . _("We located") . '" ';?>  + ' ';
+        result = result + <?php echo '"' . _("We located") . '" '; ?>  + ' ';
         result = result + Object.keys(verdict).length + ' ';
         result = result + <?php echo '"' . _("suspected areas which potentially can cause a problem.") . '"'; ?> + '<br>';
         result = result + <?php echo '"' . _("Next to the problem description we show a speculated probability of this event.") . '"'; ?>;
@@ -273,10 +273,10 @@ 
                 result = result + '<td>' + <?php echo '"' . _("RADIUS server of your service provider has a problem") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_IDP_AUTHBACKEND') {
-                result = result + '<td>' + <?php echo '"' . _("RADIUS server in your home institution has a problem to authenticate users") .'"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("RADIUS server in your home institution has a problem to authenticate users") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between your current location and your federation server is broken") .'"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The link between your current location and your federation server is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_LINK_ETLR_NRO_SP') {
                 result = result + '<td>' + <?php echo '"' . _("The link between your current location, your federation server and top level server is broken") . '"'; ?> + '</td>';
@@ -297,7 +297,7 @@ 
                 result = result + '<td>' + <?php echo '"' . _("The link between your federation server and your institution server is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_IdP_RADIUS') {
-                result = result + '<td>' + <?php echo '"' . _("RADIUS server of your home institution has a problem").'"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("RADIUS server of your home institution has a problem") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_NONEXISTENTREALM') {
                 result = result + '<td>' + <?php echo '"' . _("Entered realm doesn't exist") . '"'; ?> + '</td>';
@@ -347,7 +347,7 @@ 
         return false;
    });
    $(document).on('change', '#idp_country, #sp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list").'..."'; ?>;  
+        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);

web/skins/modern/diag/diag_admin.php

Spacing +4 added lines, -4 removed lines

@@ -139,11 +139,11 @@
                     result = '<div class="padding">';
                     result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>';
                     result = result + '<table>';
-                    result = result + '<tr><td>' + <?php echo '"' . _("SP email") . '"' ;?> +'</td><td>' + data.spcontact + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("SP email") . '"'; ?> +'</td><td>' + data.spcontact + '</td></tr>';
                     result = result + '<tr><td>' + <?php echo '"' . _("IdP email(s)") . '"'; ?> +'</td><td>' + data.idpcontact + '</td></tr>';
-                    result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp").'"'; ?> +'</td><td>' + data.timestamp + '</td></tr>';
-                    result = result + '<tr><td>' + <?php echo '"' . _("Suspected MAC address").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
-                    result = result + '<tr><td>' + <?php echo '"' . _("Additional description").'"'; ?> +'</td><td>' + data.description + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> +'</td><td>' + data.timestamp + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("Suspected MAC address") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.description + '</td></tr>';
                     result = result + '</div>';
                     showInfo(result, title);
                 }