GEANT / CAT

core/DeviceFactory.php

Spacing +3 added lines, -3 removed lines

@@ -65,8 +65,8 @@ 
         parent::__construct();
         $Dev = \devices\Devices::listDevices();
         if (isset($Dev[$blueprint])) {
-            $this->loggerInstance->debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
-            $class_name = "\devices\\" . $Dev[$blueprint]['directory'] . "\Device" . $Dev[$blueprint]['module'];
+            $this->loggerInstance->debug(4, "loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
+            $class_name = "\devices\\".$Dev[$blueprint]['directory']."\Device".$Dev[$blueprint]['module'];
             $this->device = new $class_name();
             if (!$this->device) {
                 $this->loggerInstance->debug(2, "module loading failed");
@@ -75,7 +75,7 @@ 
         } else {
             echo("unknown devicename:$blueprint\n");
         }
-        $this->device->module_path = ROOT . '/devices/' . $Dev[$blueprint]['directory'];
+        $this->device->module_path = ROOT.'/devices/'.$Dev[$blueprint]['directory'];
         $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0;
         $this->device->device_id = $blueprint;
         $options = \devices\Devices::$Options;

core/diag/Sociopath.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
                 "TXT" => _("If you use more than one device: do your other devices still work?"),
                 "FACTOR_YES" => 0.33, // seems that all is okay with the account as such
                 "FACTOR_NO" => 3, // now that is suspicious indeed
-                "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]"),],
+                "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]"), ],
             6 => ["AREA" => AbstractTest::INFRA_SP_80211,
                 "TXT" => _("Is the place you are currently at heavily crowded, or is a network-intensive workload going on?"),
                 "FACTOR_YES" => 3,
@@ -144,11 +144,11 @@ 
         $questionDetails = $this->qaArray[$questionNumber];
         if ($answer === TRUE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR_YES"];
-            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_YES"] . "\n");
+            $this->loggerInstance->debug(3, "Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR_YES"]."\n");
             $factor = $questionDetails["FACTOR_YES"];
         } elseif ($answer === FALSE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR_NO"];
-            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_NO"] . "\n");
+            $this->loggerInstance->debug(3, "Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR_NO"]."\n");
             $factor = $questionDetails["FACTOR_NO"];
         } else {
             $factor = 1;
@@ -183,7 +183,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"]]);
             }
         }
@@ -211,7 +211,7 @@ 
         $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/Telepath.php

Spacing +3 added lines, -3 removed lines

@@ -113,7 +113,7 @@ 
         if ($this->idPFederation === NULL && preg_match("/\.(..)$/", $realm, $matches)) {
             $this->idPFederation = strtoupper($matches[1]);
         }
-        $this->loggerInstance->debug(4, "XYZ: IdP-side NRO is " . $this->idPFederation . "\n");
+        $this->loggerInstance->debug(4, "XYZ: IdP-side NRO is ".$this->idPFederation."\n");
     }
     /* The eduroam OT monitoring has the following return codes:
      * 
@@ -443,12 +443,12 @@ 
                     break;
                 case \core\AbstractProfile::READINESS_LEVEL_NOTREADY:
                     $this->additionalFindings[AbstractTest::INFRA_IDP_RADIUS][] = ["Profile" => "UNCONCLUSIVE"];
-                    $this->testsuite = new RADIUSTests($this->realm, "anonymous@" . $this->realm);
+                    $this->testsuite = new RADIUSTests($this->realm, "anonymous@".$this->realm);
                     break;
                 default:
             }
         } else {
-            $this->testsuite = new RADIUSTests($this->realm, "anonymous@" . $this->realm);
+            $this->testsuite = new RADIUSTests($this->realm, "anonymous@".$this->realm);
         }
     }
 

core/diag/RFC7585Tests.php

Indentation -1 removed lines

@@ -197,7 +197,6 @@
      * - RETVAL_NOTCONFIGURED; needs \config\Diagnostics::RADIUSTESTS['TLS-discoverytag']
      * - RETVAL_INVALID (at least one format error)
      * - RETVAL_OK (all fine)
-
      * @return int one of two RETVALs above
      */
     public function relevantNAPTRcompliance()

core/EntityWithDBProperties.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
             case "core\User":
                 return $this->userName;
             default:
-                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - " . get_class($this) . "!");
+                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - ".get_class($this)."!");
         }
     }
 
@@ -177,7 +177,7 @@ 
      */
     public function beginFlushAttributes($extracondition = "")
     {
-        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
+        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
         $this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND option_name NOT LIKE '%_file' $extracondition");
         $this->updateFreshness();
         $execFlush = $this->databaseHandle->exec("SELECT row FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier $extracondition");
@@ -197,7 +197,7 @@ 
      */
     public function commitFlushAttributes(array $tobedeleted)
     {
-        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
+        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
         foreach (array_keys($tobedeleted) as $row) {
             $this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND row = $row");
             $this->updateFreshness();
@@ -226,7 +226,7 @@ 
     {
         $relevantId = $this->getRelevantIdentifier();
         $identifierType = (is_int($relevantId) ? "i" : "s");
-        $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType . "sss", $relevantId, $attrName, $attrLang, $attrValue);
+        $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType."sss", $relevantId, $attrName, $attrLang, $attrValue);
         $this->updateFreshness();
     }
 

core/DeviceConfig.php

Indentation -1 removed lines

@@ -109,7 +109,6 @@
      * ["my.server.name"] => "my.server.name"
      * ["foo.bar.de", "baz.bar.ge"] => "e"
      * ["server1.example.com", "server2.example.com", "serverN.example.com"] => ".example.com"
-
      * @return string
      */
     public function longestNameSuffix()

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
     protected function setSupportedEapMethods($eapArray)
     {
         $this->supportedEapMethods = $eapArray;
-        $this->loggerInstance->debug(4, "This device (" . __CLASS__ . ") supports the following EAP methods: ");
+        $this->loggerInstance->debug(4, "This device (".__CLASS__.") supports the following EAP methods: ");
         $this->loggerInstance->debug(4, $this->supportedEapMethods);
     }
 
@@ -460,7 +460,7 @@ 
                 return $baseName.$inst.'-'.$prof;
             }
         }
-        return $baseName . $inst;
+        return $baseName.$inst;
     }
 
     /**
@@ -590,7 +590,7 @@ 
             // only add network blocks if their respective condition is met in this profile
             if ($netDetails['condition'] === TRUE || (isset($this->attributes[$netDetails['condition']]) && $this->attributes[$netDetails['condition']] === TRUE)) { 
                 $networks[$netName] = $netDetails;
-                $this->loggerInstance->debug(5,$netName, "\nAdding network: ");
+                $this->loggerInstance->debug(5, $netName, "\nAdding network: ");
             }
         }
         // add locally defined SSIDs

web/lib/common/InputValidation.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     private function inputValidationError($customtext)
     {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>";
+        $retval = "<p>"._("Input validation error: ").$customtext."</p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -541,7 +541,7 @@ 
         try {
             $image->readImageBlob($binary);
         } catch (\ImagickException $exception) {
-            echo "Error" . $exception->getMessage();
+            echo "Error".$exception->getMessage();
             return FALSE;
         }
         // image survived the sanity check

web/user/faq.inc.php

Spacing +3 added lines, -3 removed lines

@@ -45,11 +45,11 @@ 
     ],
     [
         'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']),
-        'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
+        'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
     ],
     [
         'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-        'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+        'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
     ],
     [
         'title' => sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"), \config\ConfAssistant::CONSORTIUM['display_name']),
@@ -68,7 +68,7 @@ 
 $consortium = \config\ConfAssistant::CONSORTIUM['display_name'];
 array_push($Faq,
         [
-            'id' => 'what_is_' . \config\ConfAssistant::CONSORTIUM['name'],
+            'id' => 'what_is_'.\config\ConfAssistant::CONSORTIUM['name'],
             'title' => sprintf(_("What is this %s thing anyway?"), $consortium),
             'text' => sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than %d hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> or <a href='http://monitor.eduroam.org/map_service_loc.php'>the %s location map</a> for more details."), $consortium, $consortium, $consortium, $SPs, $consortium, $consortium)
 ]);

core/diag/RADIUSTestsUI.php

Spacing +5 added lines, -5 removed lines

@@ -290,7 +290,7 @@ 
          <table><tr>
          <td class='icon_td'>";
         $out[] = "<img src='".$this->stateIcons[$this->globalLevelStatic]."' id='main_static_ico' class='icon'></td><td id='main_static_result'>".
-                            $this->globalInfo[$this->globalLevelStatic].' '. _("See the appropriate tab for details.").'</td>
+                            $this->globalInfo[$this->globalLevelStatic].' '._("See the appropriate tab for details.").'</td>
          </tr></table>';
         if ($this->naptr > 0) {
             $out[] = "<hr><strong>"._("Dynamic connectivity tests")."</strong>
@@ -323,7 +323,7 @@ 
 <td class='icon_td'><img src='".$this->stateIcons[$result->level]."' id='src".$hostindex."_img'></td>
 <td id='src$hostindex' colspan=2>
 ";
-            $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf (_("elapsed time: %sms."), $result->time_millisec).'<p>'.$result->message.'</p>';
+            $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf(_("elapsed time: %sms."), $result->time_millisec).'<p>'.$result->message.'</p>';
                     
             if ($result->level > \core\common\Entity::L_OK && property_exists($result, 'cert_oddities')) {
                 foreach ($result->cert_oddities as $oddities) {
@@ -408,7 +408,7 @@ 
             } else {
                 $certdesc = '<br>';
             }
-            $capathtest[] = '<div>'.($capath->message!='' ? $capath->message : _('Test failed')).'</div>'.$more;
+            $capathtest[] = '<div>'.($capath->message != '' ? $capath->message : _('Test failed')).'</div>'.$more;
             $capathtest[] = '</td>
 </tr>
 </table>';
@@ -434,7 +434,7 @@ 
                         $srefused = 0;
                         $cliinfo = '';
                         $cliinfo .= '<li>'._('Client certificate').' <b>'.$ca->clientcertinfo->from.
-                                    '</b>'.', '.$ca->clientcertinfo->message .
+                                    '</b>'.', '.$ca->clientcertinfo->message.
                                     '<br> (CA: '.$ca->clientcertinfo->issuer.')<ul>';
                         foreach ($ca->certificate as $certificate) {
                             if ($certificate->returncode == \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) {
@@ -494,7 +494,7 @@ 
                 } else {
                     $cliinfo = _('Test failed');
                     $clientstest[] = "<table><tr><td class='icon_td' id='srcclient".$hostindex."_img'><img src='".
-                                    $this->stateIcons[\core\common\Entity::L_WARN]."'></td>" .
+                                    $this->stateIcons[\core\common\Entity::L_WARN]."'></td>".
                                     "<td id='srcclient$hostindex'>$cliinfo</td></tr></table>";
                 }
             } else {