GEANT / CAT

core/DeviceConfig.php

Indentation -2 removed lines

@@ -106,7 +106,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() {
@@ -340,7 +339,6 @@ 
      * 
      * @param string $format only "der" and "pem" are currently allowed
      * @return array an array of arrays or empty array on error
-
      */
     final protected function saveCertificateFiles($format) {
         switch ($format) {

Spacing +20 added lines, -20 removed lines

@@ -83,7 +83,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);
     }
 
@@ -133,7 +133,7 @@ 
                     break 2;
                 }
             }
-            $longestSuffix = $candidate . $longestSuffix;
+            $longestSuffix = $candidate.$longestSuffix;
         }
         return $longestSuffix;
     }
@@ -169,7 +169,7 @@ 
             throw new Exception("No EAP type available.");
         }
         $this->attributes = $this->getProfileAttributes($profile);
-        $this->deviceUUID = common\Entity::uuid('', 'CAT' . $profile->institution . "-" . $profile->identifier . "-" . $this->device_id);
+        $this->deviceUUID = common\Entity::uuid('', 'CAT'.$profile->institution."-".$profile->identifier."-".$this->device_id);
 
 
         // if we are instantiating a Silverbullet profile AND have been given
@@ -193,8 +193,8 @@ 
         // create temporary directory, its full path will be saved in $this->FPATH;
         $tempDir = $this->createTemporaryDirectory($purpose);
         $this->FPATH = $tempDir['dir'];
-        mkdir($tempDir['dir'] . '/tmp');
-        chdir($tempDir['dir'] . '/tmp');
+        mkdir($tempDir['dir'].'/tmp');
+        chdir($tempDir['dir'].'/tmp');
         $caList = [];
         $x509 = new \core\common\X509();
         if (isset($this->attributes['eap:ca_file'])) {
@@ -230,7 +230,7 @@ 
         $this->support_url_substitute = sprintf(_("your local %s support page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
 
         if ($this->signer && $this->options['sign']) {
-            $this->sign = ROOT . '/signer/' . $this->signer;
+            $this->sign = ROOT.'/signer/'.$this->signer;
         }
         $this->installerBasename = $this->getInstallerBasename();
         common\Entity::outOfThePotatoes();
@@ -286,10 +286,10 @@ 
      * @return string|boolean the filename as found, with path, or FALSE if it does not exist
      */
     protected function findSourceFile($file) {
-        if (is_file($this->module_path . '/Files/' . $this->device_id . '/' . $file)) {
-            return $this->module_path . '/Files/' . $this->device_id . '/' . $file;
-        } elseif (is_file($this->module_path . '/Files/' . $file)) {
-            return $this->module_path . '/Files/' . $file;
+        if (is_file($this->module_path.'/Files/'.$this->device_id.'/'.$file)) {
+            return $this->module_path.'/Files/'.$this->device_id.'/'.$file;
+        } elseif (is_file($this->module_path.'/Files/'.$file)) {
+            return $this->module_path.'/Files/'.$file;
         } else {
             $this->loggerInstance->debug(2, "requested file $file does not exist\n");
             return FALSE;
@@ -410,17 +410,17 @@ 
      */
     private function getInstallerBasename() {
 
-        $baseName = $this->customTranslit(CONFIG_CONFASSISTANT['CONSORTIUM']['name']) . "-" . $this->getDeviceId();
+        $baseName = $this->customTranslit(CONFIG_CONFASSISTANT['CONSORTIUM']['name'])."-".$this->getDeviceId();
         if (isset($this->attributes['profile:customsuffix'][1])) {
             // this string will end up as a filename on a filesystem, so always
             // take a latin-based language variant if available
             // and then scrub non-ASCII just in case
-            return $baseName . $this->customTranslit($this->attributes['profile:customsuffix'][1]);
+            return $baseName.$this->customTranslit($this->attributes['profile:customsuffix'][1]);
         }
         // Okay, no custom suffix. 
         // Use the configured inst name and apply shortening heuristics
         $lang_pointer = CONFIG['LANGUAGES'][$this->languageInstance->getLang()]['latin_based'] == TRUE ? 0 : 1;
-        $this->loggerInstance->debug(5, "getInstallerBasename1:" . $this->attributes['general:instname'][$lang_pointer] . "\n");
+        $this->loggerInstance->debug(5, "getInstallerBasename1:".$this->attributes['general:instname'][$lang_pointer]."\n");
         $inst = $this->customTranslit($this->attributes['general:instname'][$lang_pointer]);
         $this->loggerInstance->debug(4, "getInstallerBasename2:$inst\n");
         $Inst_a = explode('_', $inst);
@@ -435,10 +435,10 @@ 
             if (!empty($this->attributes['profile:name']) && !empty($this->attributes['profile:name'][$lang_pointer])) {
                 $profTemp = $this->customTranslit($this->attributes['profile:name'][$lang_pointer]);
                 $prof = preg_replace('/_+$/', '', $profTemp);
-                return $baseName . $inst . '-' . $prof;
+                return $baseName.$inst.'-'.$prof;
             }
         }
-        return $baseName . $inst;
+        return $baseName.$inst;
     }
 
     /**
@@ -551,7 +551,7 @@ 
                 $ext = 'unsupported';
             }
             $this->loggerInstance->debug(5, "saveLogoFile: $mime : $ext\n");
-            $fileName = 'logo-' . $type . $iterator . '.' . $ext;
+            $fileName = 'logo-'.$type.$iterator.'.'.$ext;
             $fileHandle = fopen($fileName, "w");
             if (!$fileHandle) {
                 $this->loggerInstance->debug(2, "saveLogoFile failed for: $fileName\n");
@@ -577,13 +577,13 @@ 
         $mime = $finfo->buffer($blob);
         $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
         $this->loggerInstance->debug(5, "saveInfoFile: $mime : $ext\n");
-        $fileHandle = fopen('local-info.' . $ext, "w");
+        $fileHandle = fopen('local-info.'.$ext, "w");
         if ($fileHandle === FALSE) {
             throw new Exception("problem opening the file");
         }
         fwrite($fileHandle, $blob);
         fclose($fileHandle);
-        return(['name' => 'local-info.' . $ext, 'mime' => $ext]);
+        return(['name' => 'local-info.'.$ext, 'mime' => $ext]);
     }
 
     /**
@@ -634,9 +634,9 @@ 
     protected function determineOuterIdString() {
         $outerId = NULL;
         if (isset($this->attributes['internal:use_anon_outer']) && $this->attributes['internal:use_anon_outer'][0] == "1" && isset($this->attributes['internal:realm'])) {
-            $outerId = "@" . $this->attributes['internal:realm'][0];
+            $outerId = "@".$this->attributes['internal:realm'][0];
             if (isset($this->attributes['internal:anon_local_value'])) {
-                $outerId = $this->attributes['internal:anon_local_value'][0] . $outerId;
+                $outerId = $this->attributes['internal:anon_local_value'][0].$outerId;
             }
         }
         return $outerId;