GEANT / CAT

devices/linux/DeviceLinuxSh.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
         }
 
         if (!empty($this->attributes['internal:realm'][0])) {
-           $config['USER_REALM'] = $this->attributes['internal:realm'][0];
+            $config['USER_REALM'] = $this->attributes['internal:realm'][0];
         }
 
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {

Braces +1 added lines, -2 removed lines

@@ -203,8 +203,7 @@
 
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') {
             $configRaw['USE_OTHER_TLS_ID'] = true;
-        }
-        else {
+        } else {
             $configRaw['USE_OTHER_TLS_ID'] = false;
         }
 

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
         $installerPath = $this->installerBasename.".sh";
         $this->copyFile("eduroam_linux_main.sh", $installerPath);
 
-        if ( !file_exists($installerPath) ) {
+        if (!file_exists($installerPath)) {
             throw new Exception('File not found.');
         }
 
@@ -68,7 +68,7 @@ 
             fwrite($installer, 'printf -v INIT_CONFIRMATION "$INIT_CONFIRMATION_TMP" "$ORGANISATION"'."\n\n");
             fwrite($installer, 'main "$@"; exit'."\n");
         } catch (Exception $e) {
-            echo 'Error message: ' .$e->getMessage();
+            echo 'Error message: '.$e->getMessage();
         } finally {
             fclose($installer);
             return($installerPath);
@@ -204,11 +204,11 @@ 
            $config['USER_REALM'] = $this->attributes['internal:realm'][0];
         }
 
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $configRaw['HINT_USER_INPUT'] = true;
         }
 
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $configRaw['VERIFY_USER_REALM_INPUT'] = true;
         } else {
             $configRaw['VERIFY_USER_REALM_INPUT'] = false;
@@ -219,7 +219,7 @@ 
         }
 
         foreach ($configRaw as $name => $value) {
-            fwrite($file, $name ."=". $value."\n");
+            fwrite($file, $name."=".$value."\n");
         }
 
         if ($tou === '') {
@@ -283,7 +283,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "(".$out. ")";
+        return "(".$out.")";
     }
 
     /**
@@ -323,7 +323,7 @@ 
      *
      * @return string
      */
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {
@@ -339,7 +339,7 @@ 
      */
     private function mkIntro() {
         \core\common\Entity::intoThePotatoes();
-        $out = _("This installer has been prepared for %s").'\n\n'._("More information and comments:").'\n\nE-Mail: %s\nWWW: %s\n\n' .
+        $out = _("This installer has been prepared for %s").'\n\n'._("More information and comments:").'\n\nE-Mail: %s\nWWW: %s\n\n'.
             _("Installer created with software from the GEANT project.");
         \core\common\Entity::outOfThePotatoes();
         return $out;

core/ProfileSilverbullet.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 
 // realm is automatically calculated, then stored in DB
 
-        $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
+        $this->realm = "opaquehash@$myInst->identifier-$this->identifier.".strtolower($myInst->federation).\config\ConfAssistant::SILVERBULLET['realm_suffix'];
         $localValueIfAny = "";
 
 // but there's some common internal attributes populated directly
@@ -113,11 +113,11 @@ 
 
         // and we need to populate eap:server_name and eap:ca_file with the NRO-specific EAP information
         $silverbulletAttributes = [
-            "eap:server_name" => "auth." . strtolower($myFed->tld) . \config\ConfAssistant::SILVERBULLET['server_suffix'],
+            "eap:server_name" => "auth.".strtolower($myFed->tld).\config\ConfAssistant::SILVERBULLET['server_suffix'],
         ];
         $temp = array_merge($this->addInternalAttributes($internalAttributes), $this->addInternalAttributes($silverbulletAttributes));
         $x509 = new \core\common\X509();
-        $caHandle = fopen(dirname(__FILE__) . "/../config/SilverbulletServerCerts/" . strtoupper($myFed->tld) . "/root.pem", "r");
+        $caHandle = fopen(dirname(__FILE__)."/../config/SilverbulletServerCerts/".strtoupper($myFed->tld)."/root.pem", "r");
         if ($caHandle !== FALSE) {
             $cAFile = fread($caHandle, 16000000);
             foreach ($x509->splitCertificate($cAFile) as $oneCa) {
@@ -273,7 +273,7 @@ 
         if (empty($certNames)) {
             return [];
         }
-        $namesCondensed = "'" . implode("' OR username = '", $certNames) . "'";
+        $namesCondensed = "'".implode("' OR username = '", $certNames)."'";
         $serverHandles = DBConnection::handle("RADIUS");
         $returnarray = [];
         foreach ($serverHandles as $oneDbServer) {

Indentation +1 added lines, -1 removed lines

@@ -361,7 +361,7 @@
                 . "     OR"
                 . "  ( u.id = c.silverbullet_user_id AND c.expiry >= NOW() AND c.revocation_status != 'REVOKED' ) "
                 . ")", "i", $this->identifier);
-      // SELECT -> resource, not boolean
+        // SELECT -> resource, not boolean
         while ($res = mysqli_fetch_object(/** @scrutinizer ignore-type */ $users)) {
             $userCount[$res->usercount] = "ACTIVE";
         }

core/common/X509.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     public function der2pem($derData)
     {
         $pem = chunk_split(base64_encode($derData), 64, "\n");
-        $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n";
+        $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
         return $pem;
     }
 

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/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/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/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)
 ]);

web/admin/edit_user.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $uiElements = new web\lib\admin\UIElements();
@@ -37,14 +37,14 @@ 
     </h1>
     <div class='infobox'>
         <h2>
-            <?php $tablecaption = _("Current User Attributes"); echo $tablecaption;?>
+            <?php $tablecaption = _("Current User Attributes"); echo $tablecaption; ?>
         </h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
         </table>