GEANT / CAT

devices/linux/DeviceLinux.php

Spacing +19 added lines, -19 removed lines

@@ -58,9 +58,9 @@ 
      *
      */
     public function writeInstaller() {
-        $installerPath = $this->installerBasename . ".py";
+        $installerPath = $this->installerBasename.".py";
         $this->copyFile("main.py", $installerPath);
-        $installer = fopen($installerPath,"a");
+        $installer = fopen($installerPath, "a");
         if ($installer === FALSE) {
             throw new Exception("Unable to open installer file for writing!");
         }
@@ -111,8 +111,8 @@ 
      * @return void
      */
     private function writeConfigLine($file, $prefix, $name, $text) {
-        $out = $prefix . $name . ' = "' . $text;
-        fwrite($file, wordwrap($out, 70, " \" \\\n    \"") . "\n");
+        $out = $prefix.$name.' = "'.$text;
+        fwrite($file, wordwrap($out, 70, " \" \\\n    \"")."\n");
     }
     
     /**
@@ -151,7 +151,7 @@ 
         'user_cert_missing' => _("personal certificate file not found"),
         ];
         foreach ($messages as $name => $value) {
-            $this->writeConfigLine($file, 'Messages.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Messages.', $name, $value.'"');
         }
         \core\common\Entity::outOfThePotatoes();
     }
@@ -195,39 +195,39 @@ 
         }
 
         if ($outerId !== NULL) {
-            $configRaw['anonymous_identity'] = '"' . $outerId . '"';
+            $configRaw['anonymous_identity'] = '"'.$outerId.'"';
         }
 
         if (!empty($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) {
+        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";
         }
         
         foreach ($config as $name => $value) {
-            $this->writeConfigLine($file, 'Config.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Config.', $name, $value.'"');
         }
         
         foreach ($configRaw as $name => $value) {
-            fwrite($file, 'Config.' . $name . ' = ' . $value . "\n");
+            fwrite($file, 'Config.'.$name.' = '.$value."\n");
         }
         
         if ($tou === '') {
-            fwrite($file, 'Config.tou = ""' . "\n");
+            fwrite($file, 'Config.tou = ""'."\n");
         } else {
-            fwrite($file, 'Config.tou = """' . $tou . '"""' . "\n");
+            fwrite($file, 'Config.tou = """'.$tou.'"""'."\n");
         }
         
-        fwrite($file, 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n");
+        fwrite($file, 'Config.CA = """'.$this->mkCAfile().'"""'."\n");
         $sbUserFile = $this->mkSbUserFile();
         if ($sbUserFile !== '') {
-            fwrite($file, 'Config.sb_user_file = """' . $sbUserFile . '"""' . "\n");
+            fwrite($file, 'Config.sb_user_file = """'.$sbUserFile.'"""'."\n");
         }
     }
 
@@ -279,7 +279,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[".$out."]";
     }
 
     /**
@@ -295,7 +295,7 @@ 
                 $outArray = array_merge($outArray, $networkDetails['ssid']);
             }
         }
-        return "['" . implode("', '", $outArray) . "']";
+        return "['".implode("', '", $outArray)."']";
     }
     
     /**
@@ -311,7 +311,7 @@ 
                 $outArray[] = "'$ssid'";
             }
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -319,7 +319,7 @@ 
      * 
      * @return string
      */
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {
@@ -335,7 +335,7 @@ 
      */
     private function mkIntro() {
         \core\common\Entity::intoThePotatoes();
-        $out = _("This installer has been prepared for {0}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: {1}\nWWW: {2}\n\n' .
+        $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'.
             _("Installer created with software from the GEANT project.");
         \core\common\Entity::outOfThePotatoes();
         return $out;