GEANT / CAT

web/diag/testTelepath.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $therealm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
 $thevisited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
@@ -35,7 +35,7 @@ 
     $validator = new \web\lib\common\InputValidation();
     
     echo "<pre>";
-    echo "Testing " . $validatedRealm . " in " . $validator->string($thevisited);
+    echo "Testing ".$validatedRealm." in ".$validator->string($thevisited);
     print_r($telepath->magic());
     echo "</pre>";
 }
\ No newline at end of file

web/diag/testSociopath.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $sociopath = new \core\diag\Sociopath();
 

web/lib/user/Skinjob.php

Spacing +6 added lines, -6 removed lines

@@ -95,17 +95,17 @@
         }
 
         // does the file exist in the current skin's directory? Has precedence
-        if ($submodule !== '' && file_exists(__DIR__ . "/../../skins/" . $this->skin . "/" . $submodule . $path . $filename)) {
-            $extrapath = "/skins/" . $this->skin . "/" . $submodule;
+        if ($submodule !== '' && file_exists(__DIR__."/../../skins/".$this->skin."/".$submodule.$path.$filename)) {
+            $extrapath = "/skins/".$this->skin."/".$submodule;
         }
-        elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) {
-            $extrapath = "/skins/" . $this->skin;
-        } elseif (file_exists(__DIR__ . "/../../" . $path . $filename)) {
+        elseif (file_exists(__DIR__."/../../skins/".$this->skin.$path.$filename)) {
+            $extrapath = "/skins/".$this->skin;
+        } elseif (file_exists(__DIR__."/../../".$path.$filename)) {
             $extrapath = "";
         } else {
             return FALSE;
         }       
-        return htmlspecialchars(\core\CAT::getRootUrlPath() . $extrapath . $path . $filename, ENT_QUOTES);
+        return htmlspecialchars(\core\CAT::getRootUrlPath().$extrapath.$path.$filename, ENT_QUOTES);
     }
 
 }

web/lib/admin/Maintenance.php

Spacing +4 added lines, -4 removed lines

@@ -34,8 +34,8 @@ 
      */
     public static function deleteObsoleteTempDirs() {
         $downloadsDirs = [
-            'site_installers' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/installer_cache",
-            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/silverbullet"
+            'site_installers' => dirname(dirname(dirname(dirname(__FILE__))))."/var/installer_cache",
+            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__))))."/var/silverbullet"
         ];
         $tm = time();
         $i = 0;
@@ -54,14 +54,14 @@ 
                     if ($entry === '.' || $entry === '..' || $entry === '.gitignore') {
                         continue;
                     }
-                    $ftime = $tm - filemtime($downloads . '/' . $entry);
+                    $ftime = $tm - filemtime($downloads.'/'.$entry);
                     if ($ftime < 3600) {
                         continue;
                     }
                     if (isset($Cache[$entry])) {
                         continue;
                     }
-                    \core\common\Entity::rrmdir($downloads . '/' . $entry);
+                    \core\common\Entity::rrmdir($downloads.'/'.$entry);
                     $i = $i + 1;
                     print "$entry\n";
                 }

web/copyright.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 // ... unless overwritten by direct GET/POST parameter in the request or a SESSION setting

web/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 // ... unless overwritten by direct GET/POST parameter in the request or a SESSION setting

devices/chromebook/DeviceChromebook.php

Spacing +10 added lines, -10 removed lines

@@ -117,7 +117,7 @@ 
         $cryptoJson = openssl_encrypt($clearJson, 'AES-256-CBC', $encryptionKey, OPENSSL_RAW_DATA, $initVector);
         $hmac = hash_hmac("sha1", $cryptoJson, $encryptionKey, TRUE);
 
-        $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = " . $password . "\nb(IV) = " . base64_encode($initVector) . "\nb(Cipher) = " . base64_encode($cryptoJson) . "\nb(HMAC) = " . base64_encode($hmac));
+        $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = ".$password."\nb(IV) = ".base64_encode($initVector)."\nb(Cipher) = ".base64_encode($cryptoJson)."\nb(HMAC) = ".base64_encode($hmac));
 
         // now, generate the container that holds all the crypto data
         $finalArray = [
@@ -188,7 +188,7 @@ 
      */
     private function wiredBlock($eapdetails) {
         return [
-            "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet") . "}",
+            "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet")."}",
             "Name" => "eduroam configuration (wired network)",
             "Remove" => false,
             "Type" => "Ethernet",
@@ -228,7 +228,7 @@ 
         // if silverbullet, we deliver the client cert inline
 
         if ($selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
-            $eaparray['ClientCertRef'] = "[" . $this->clientCert['GUID'] . "]";
+            $eaparray['ClientCertRef'] = "[".$this->clientCert['GUID']."]";
             $eaparray['ClientCertType'] = "Ref";
         }
 
@@ -261,7 +261,7 @@ 
         $jsonArray = ["Type" => "UnencryptedConfiguration"];
 
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
-            $caRefs[] = "{" . $ca['uuid'] . "}";
+            $caRefs[] = "{".$ca['uuid']."}";
         }
         // define CA certificates
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
@@ -271,15 +271,15 @@ 
             if ($caSanitized1 === FALSE) {
                 throw new Exception("Error cropping PEM data at its BEGIN marker.");
             }
-            $this->loggerInstance->debug(4, $caSanitized1 . "\n");
+            $this->loggerInstance->debug(4, $caSanitized1."\n");
             // remove \n
             $caSanitized = str_replace("\n", "", $caSanitized1);
-            $jsonArray["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
-            $this->loggerInstance->debug(3, $caSanitized . "\n");
+            $jsonArray["Certificates"][] = ["GUID" => "{".$ca['uuid']."}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
+            $this->loggerInstance->debug(3, $caSanitized."\n");
         }
         // if we are doing silverbullet, include the unencrypted(!) P12 as a client certificate
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
-            $jsonArray["Certificates"][] = ["GUID" => "[" . $this->clientCert['GUID'] . "]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
+            $jsonArray["Certificates"][] = ["GUID" => "[".$this->clientCert['GUID']."]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
         }
         $eaparray = $this->eapBlock($caRefs);
         // define Wi-Fi networks
@@ -300,7 +300,7 @@ 
 
         file_put_contents('installer_profile', $finalJson);
 
-        $fileName = $this->installerBasename . '.onc';
+        $fileName = $this->installerBasename.'.onc';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -311,7 +311,7 @@ 
         // have the notion of signing
         // but if they ever change their mind, we are prepared
 
-        $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($outputFromSigning === FALSE) {
             $this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n");
         }

devices/test_module/DeviceTestModule.php

Spacing +2 added lines, -2 removed lines

@@ -138,8 +138,8 @@
      */
     private function zipInstaller() {
         // one can always access $this->attributes to check things
-        $fileName = $this->installerBasename . '.zip';
-        $output = system('zip -q ' . $fileName . ' *');
+        $fileName = $this->installerBasename.'.zip';
+        $output = system('zip -q '.$fileName.' *');
         if ($output === FALSE) {
             $this->loggerInstance->debug(2, "unable to zip the installer\n");
         }

devices/redirect_dev/DeviceRedirectDev.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     final public function __construct() {
         parent::__construct();
       $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+      $this->loggerInstance->debug(4, "RedirectEx called");
     }
     
     /**