GEANT / CAT

core/UserAPI.php

Spacing +13 added lines, -13 removed lines

@@ -83,7 +83,7 @@ 
         $this->installerPath = $cache['path'];
         if ($this->installerPath !== NULL && $token === NULL && $password === NULL) {
             $this->loggerInstance->debug(4, "Using cached installer for: $device\n");
-            $installerProperties['link'] = "API.php?action=downloadInstaller&lang=" . $this->languageInstance->getLang() . "&profile=$profileId&device=$device&generatedfor=$generatedFor";
+            $installerProperties['link'] = "API.php?action=downloadInstaller&lang=".$this->languageInstance->getLang()."&profile=$profileId&device=$device&generatedfor=$generatedFor";
             $installerProperties['mime'] = $cache['mime'];
         } else {
             $myInstaller = $this->generateNewInstaller($device, $profile, $generatedFor, $token, $password);
@@ -171,7 +171,7 @@ 
             $this->loggerInstance->debug(5, "generateNewInstaller() - Device setup done");
             $installer = $dev->writeInstaller();
             $this->loggerInstance->debug(5, "generateNewInstaller() - writeInstaller complete");
-            $iPath = $dev->FPATH . '/tmp/' . $installer;
+            $iPath = $dev->FPATH.'/tmp/'.$installer;
             if ($iPath && is_file($iPath)) {
                 if (isset($dev->options['mime'])) {
                     $out['mime'] = $dev->options['mime'];
@@ -179,17 +179,17 @@ 
                     $info = new \finfo();
                     $out['mime'] = $info->file($iPath, FILEINFO_MIME_TYPE);
                 }
-                $this->installerPath = $dev->FPATH . '/' . $installer;
+                $this->installerPath = $dev->FPATH.'/'.$installer;
                 rename($iPath, $this->installerPath);
                 $integerEap = (new \core\common\EAP($dev->selectedEap))->getIntegerRep();
                 $profile->updateCache($device, $this->installerPath, $out['mime'], $integerEap);
                 if (CONFIG['DEBUG_LEVEL'] < 4) {
-                    \core\common\Entity::rrmdir($dev->FPATH . '/tmp');
+                    \core\common\Entity::rrmdir($dev->FPATH.'/tmp');
                 }
-                $this->loggerInstance->debug(4, "Generated installer: " . $this->installerPath . ": for: $device, EAP:" . $integerEap . "\n");
-                $out['link'] = "API.php?action=downloadInstaller&lang=" . $this->languageInstance->getLang() . "&profile=" . $profile->identifier . "&device=$device&generatedfor=$generatedFor";
+                $this->loggerInstance->debug(4, "Generated installer: ".$this->installerPath.": for: $device, EAP:".$integerEap."\n");
+                $out['link'] = "API.php?action=downloadInstaller&lang=".$this->languageInstance->getLang()."&profile=".$profile->identifier."&device=$device&generatedfor=$generatedFor";
             } else {
-                $this->loggerInstance->debug(2, "Installer generation failed for: " . $profile->identifier . ":$device:" . $this->languageInstance->getLang() . "\n");
+                $this->loggerInstance->debug(2, "Installer generation failed for: ".$profile->identifier.":$device:".$this->languageInstance->getLang()."\n");
                 $out['link'] = 0;
             }
         }
@@ -302,9 +302,9 @@ 
         $file = $this->installerPath;
         $filetype = $output['mime'];
         $this->loggerInstance->debug(4, "installer MIME type:$filetype\n");
-        header("Content-type: " . $filetype);
-        header('Content-Disposition: inline; filename="' . basename($file) . '"');
-        header('Content-Length: ' . filesize($file));
+        header("Content-type: ".$filetype);
+        header('Content-Disposition: inline; filename="'.basename($file).'"');
+        header('Content-Length: '.filesize($file));
         ob_clean();
         flush();
         readfile($file);
@@ -325,7 +325,7 @@ 
         $filetype = $info->buffer($inputImage, FILEINFO_MIME_TYPE);
         $offset = 60 * 60 * 24 * 30;
         // gmdate cannot fail here - time() is its default argument (and integer), and we are adding an integer to it
-        $expiresString = "Expires: " . /** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
+        $expiresString = "Expires: "./** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset)." GMT";
         $blob = $inputImage;
 
         if ($resize === TRUE) {
@@ -380,7 +380,7 @@ 
         $filetype = 'image/png'; // default, only one code path where it can become different
         list($width, $height, $resize) = $this->testForResize($widthIn, $heightIn);
         if ($resize) {
-            $logoFile = ROOT . '/web/downloads/logos/' . $identifier . '_' . $width . '_' . $height . '.png';
+            $logoFile = ROOT.'/web/downloads/logos/'.$identifier.'_'.$width.'_'.$height.'.png';
         }
         if (is_file($logoFile)) { // $logoFile could be an empty string but then we will get a FALSE
             $this->loggerInstance->debug(4, "Using cached logo $logoFile for: $identifier\n");
@@ -473,7 +473,7 @@ 
             if (!isset($device['match'])) {
                 continue;
             }
-            if (preg_match('/' . $device['match'] . '/', $browser)) {
+            if (preg_match('/'.$device['match'].'/', $browser)) {
                 return $this->returnDevice($devId, $device);
             }
         }

devices/ms/WindowsCommon.php

Spacing +31 added lines, -31 removed lines

@@ -106,7 +106,7 @@ 
 
         $this->loggerInstance->debug(5, "translateFile($source_name, $output_name, $encoding)\n");
         ob_start();
-        $this->loggerInstance->debug(5, $this->module_path . '/Files/' . $this->device_id . '/' . $source_name . "\n");
+        $this->loggerInstance->debug(5, $this->module_path.'/Files/'.$this->device_id.'/'.$source_name."\n");
         $source = $this->findSourceFile($source_name);
 
         if ($source !== FALSE) { // if there is no file found, don't attempt to include an uninitialised variable
@@ -114,7 +114,7 @@ 
         }
         $output = ob_get_clean();
         if ($encoding) {
-            $outputClean = iconv('UTF-8', $encoding . '//TRANSLIT', $output);
+            $outputClean = iconv('UTF-8', $encoding.'//TRANSLIT', $output);
             if ($outputClean) {
                 $output = $outputClean;
             }
@@ -158,7 +158,7 @@ 
             $encoding = 0;
         }
         if ($encoding) {
-            $output_c = iconv('UTF-8', $encoding . '//TRANSLIT', $source_string);
+            $output_c = iconv('UTF-8', $encoding.'//TRANSLIT', $source_string);
         } else {
             $output_c = $source_string;
         }
@@ -237,7 +237,7 @@ 
         if (isset($this->LANGS[$this->languageInstance->getLang()])) {
             $language = $this->LANGS[$this->languageInstance->getLang()];
             $this->lang = $language['nsis'];
-            $this->codePage = 'cp' . $language['cp'];
+            $this->codePage = 'cp'.$language['cp'];
         } else {
             $this->lang = 'English';
             $this->codePage = 'cp1252';
@@ -259,8 +259,8 @@ 
         $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $out .= "<p>";
         if ($ssidCount > $configCount) {
-            $out .= sprintf(ngettext("In addition to <strong>%s</strong> the installer will also configure access to:", "In addition to <strong>%s</strong> the installer will also configure access to the following networks:", $ssidCount - $configCount), implode(', ', $configList)) . " ";
-            $out .= '<strong>' . join('</strong>, <strong>', array_diff(array_keys($ssids), $configList)) . '</strong>';
+            $out .= sprintf(ngettext("In addition to <strong>%s</strong> the installer will also configure access to:", "In addition to <strong>%s</strong> the installer will also configure access to the following networks:", $ssidCount - $configCount), implode(', ', $configList))." ";
+            $out .= '<strong>'.join('</strong>, <strong>', array_diff(array_keys($ssids), $configList)).'</strong>';
             $out .= "<p>";
         }
 // TODO - change this below
@@ -276,8 +276,8 @@ 
             $out .= _("When you are connecting to the network for the first time, Windows will pop up a login box, where you should enter your user name and password. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
             if ($ssidCount > 1) {
                 $out .= "<p>";
-                $out .= _("You will be required to enter the same credentials for each of the configured networks:") . " ";
-                $out .= '<strong>' . join('</strong>, <strong>', array_keys($ssids)) . '</strong>';
+                $out .= _("You will be required to enter the same credentials for each of the configured networks:")." ";
+                $out .= '<strong>'.join('</strong>, <strong>', array_keys($ssids)).'</strong>';
             }
         }
         return $out;
@@ -379,13 +379,13 @@ 
      */
     protected function signInstaller()
     {
-        $fileName = $this->installerBasename . '.exe';
+        $fileName = $this->installerBasename.'.exe';
         if (!$this->sign) {
             rename("installer.exe", $fileName);
             return $fileName;
         }
         // are actually signing
-        $outputFromSigning = system($this->sign . " installer.exe '$fileName' > /dev/null");
+        $outputFromSigning = system($this->sign." installer.exe '$fileName' > /dev/null");
         if ($outputFromSigning === FALSE) {
             $this->loggerInstance->debug(2, "Signing the WindowsCommon installer $fileName FAILED!\n");
         }
@@ -400,15 +400,15 @@ 
     protected function compileNSIS()
     {
         if (CONFIG_CONFASSISTANT['NSIS_VERSION'] >= 3) {
-            $makensis = CONFIG_CONFASSISTANT['PATHS']['makensis'] . " -INPUTCHARSET UTF8";
+            $makensis = CONFIG_CONFASSISTANT['PATHS']['makensis']." -INPUTCHARSET UTF8";
         } else {
             $makensis = CONFIG_CONFASSISTANT['PATHS']['makensis'];
         }
         $lcAll = getenv("LC_ALL");
         putenv("LC_ALL=en_US.UTF-8");
-        $command = $makensis . ' -V4 cat.NSI > nsis.log 2>&1';
+        $command = $makensis.' -V4 cat.NSI > nsis.log 2>&1';
         system($command);
-        putenv("LC_ALL=" . $lcAll);
+        putenv("LC_ALL=".$lcAll);
         $this->loggerInstance->debug(4, "compileNSIS:$command\n");
     }
 
@@ -425,10 +425,10 @@ 
             'email' => 'SUPPORT',
             'url' => 'URL',
         ];
-        $s = "support_" . $type . "_substitute";
+        $s = "support_".$type."_substitute";
         $substitute = $this->translateString($this->$s, $this->codePage);
-        $returnValue = !empty($attr['support:' . $type][0]) ? $attr['support:' . $type][0] : $substitute;
-        return '!define ' . $supportString[$type] . ' "' . $returnValue . '"' . "\n";
+        $returnValue = !empty($attr['support:'.$type][0]) ? $attr['support:'.$type][0] : $substitute;
+        return '!define '.$supportString[$type].' "'.$returnValue.'"'."\n";
     }
 
     /**
@@ -439,20 +439,20 @@ 
      */
     protected function writeNsisDefines($attr)
     {
-        $fcontents = "\n" . '!define NSIS_MAJOR_VERSION ' . CONFIG_CONFASSISTANT['NSIS_VERSION'];
+        $fcontents = "\n".'!define NSIS_MAJOR_VERSION '.CONFIG_CONFASSISTANT['NSIS_VERSION'];
         if ($attr['internal:profile_count'][0] > 1) {
-            $fcontents .= "\n" . '!define USER_GROUP "' . $this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0]), $this->codePage) . '"
+            $fcontents .= "\n".'!define USER_GROUP "'.$this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0]), $this->codePage).'"
 ';
         }
         $fcontents .= '
-Caption "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
-!define APPLICATION "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
-!define VERSION "' . \core\CAT::VERSION_MAJOR . '.' . \core\CAT::VERSION_MINOR . '"
+Caption "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage).'"
+!define APPLICATION "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage).'"
+!define VERSION "' . \core\CAT::VERSION_MAJOR.'.'.\core\CAT::VERSION_MINOR.'"
 !define INSTALLER_NAME "installer.exe"
-!define LANG "' . $this->lang . '"
-!define LOCALE "' . preg_replace('/\..*$/', '', CONFIG['LANGUAGES'][$this->languageInstance->getLang()]['locale']) . '"
+!define LANG "' . $this->lang.'"
+!define LOCALE "' . preg_replace('/\..*$/', '', CONFIG['LANGUAGES'][$this->languageInstance->getLang()]['locale']).'"
 ;--------------------------------
-!define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '"
+!define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage).'"
 ';
         $fcontents .= $this->getSupport($attr, 'email');
         $fcontents .= $this->getSupport($attr, 'url');
@@ -460,18 +460,18 @@ 
             $fcontents .= '!define WIRED
         ';
         }
-        $fcontents .= '!define PROVIDERID "urn:UUID:' . $this->deviceUUID . '"
+        $fcontents .= '!define PROVIDERID "urn:UUID:'.$this->deviceUUID.'"
 ';
         if (!empty($attr['internal:realm'][0])) {
-            $fcontents .= '!define REALM "' . $attr['internal:realm'][0] . '"
+            $fcontents .= '!define REALM "'.$attr['internal:realm'][0].'"
 ';
         }
         if (!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) {
-            $fcontents .= '!define HINT_USER_INPUT "' . $attr['internal:hint_userinput_suffix'][0] . '"
+            $fcontents .= '!define HINT_USER_INPUT "'.$attr['internal:hint_userinput_suffix'][0].'"
 ';
         }
         if (!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) {
-            $fcontents .= '!define VERIFY_USER_REALM_INPUT "' . $attr['internal:verify_userinput_suffix'][0] . '"
+            $fcontents .= '!define VERIFY_USER_REALM_INPUT "'.$attr['internal:verify_userinput_suffix'][0].'"
 ';
         }
         $fcontents .= $this->msInfoFile($attr);
@@ -492,7 +492,7 @@ 
             $out .= '!define EXTERNAL_INFO "';
 //  $this->loggerInstance->debug(4,"Info file type ".$attr['support:info_file'][0]['mime']."\n");
             if ($attr['internal:info_file'][0]['mime'] == 'rtf') {
-                $out = '!define LICENSE_FILE "' . $attr['internal:info_file'][0]['name'];
+                $out = '!define LICENSE_FILE "'.$attr['internal:info_file'][0]['name'];
             } elseif ($attr['internal:info_file'][0]['mime'] == 'txt') {
                 $infoFile = file_get_contents($attr['internal:info_file'][0]['name']);
                 if ($infoFile === FALSE) {
@@ -501,14 +501,14 @@ 
                 if (CONFIG_CONFASSISTANT['NSIS_VERSION'] >= 3) {
                     $infoFileConverted = $infoFile;
                 } else {
-                    $infoFileConverted = iconv('UTF-8', $this->codePage . '//TRANSLIT', $infoFile);
+                    $infoFileConverted = iconv('UTF-8', $this->codePage.'//TRANSLIT', $infoFile);
                 }
                 if ($infoFileConverted !== FALSE && strlen($infoFileConverted) > 0) {
                     file_put_contents('info_f.txt', $infoFileConverted);
                     $out = '!define LICENSE_FILE " info_f.txt';
                 }
             } else {
-                $out = '!define EXTERNAL_INFO "' . $attr['internal:info_file'][0]['name'];
+                $out = '!define EXTERNAL_INFO "'.$attr['internal:info_file'][0]['name'];
             }
 
             $out .= "\"\n";

core/SanityTests.php

Spacing +39 added lines, -39 removed lines

@@ -48,9 +48,9 @@ 
 use GeoIp2\Database\Reader;
 use \Exception;
 
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
-require_once dirname(dirname(__FILE__)) . "/core/PHPMailer/src/PHPMailer.php";
-require_once dirname(dirname(__FILE__)) . "/core/PHPMailer/src/SMTP.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
+require_once dirname(dirname(__FILE__))."/core/PHPMailer/src/PHPMailer.php";
+require_once dirname(dirname(__FILE__))."/core/PHPMailer/src/SMTP.php";
 
 class SanityTests extends CAT {
     /* in this section set current CAT requirements */
@@ -90,7 +90,7 @@ 
         $this->test_result = [];
         $this->test_result['global'] = 0;
         // parse the schema file to find out the number of expected rows...
-        $schema = file(dirname(dirname(__FILE__)) . "/schema/schema.sql");
+        $schema = file(dirname(dirname(__FILE__))."/schema/schema.sql");
         $this->profile_option_ct = 0;
         $passedTheWindmill = FALSE;
         foreach ($schema as $schemaLine) {
@@ -116,7 +116,7 @@ 
     public function test($test) {
         $this->out[$test] = [];
         $this->name = $test;
-        $m_name = $test . '_test';
+        $m_name = $test.'_test';
         $this->test_result[$test] = 0;
         if (!method_exists($this, $m_name)) {
             $this->testReturn(\core\common\Entity::L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
@@ -204,7 +204,7 @@ 
                 $matchArray = [];
                 preg_match('/([^ ]+) ?/', $config['PATHS'][$pathToCheck], $matchArray);
                 $exe = $matchArray[1];
-                $the_path = exec("which " . $config['PATHS'][$pathToCheck]);
+                $the_path = exec("which ".$config['PATHS'][$pathToCheck]);
                 if ($the_path == $exe) {
                     $exec_is = "EXPLICIT";
                 } else {
@@ -223,9 +223,9 @@ 
      */
     private function php_test() {
         if (version_compare(phpversion(), $this->php_needversion, '>=')) {
-            $this->testReturn(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+            $this->testReturn(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
         } else {
-            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have " . phpversion() . ".");
+            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have ".phpversion().".");
         }
     }
 
@@ -241,7 +241,7 @@ 
             $this->testReturn(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
         } else {
             $rootFromScript = $m[1] === '' ? '/' : $m[1];
-            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>" . CONFIG['PATHS']['cat_base_url'] . "</strong> and should be <strong>$rootFromScript</strong>");
+            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>".CONFIG['PATHS']['cat_base_url']."</strong> and should be <strong>$rootFromScript</strong>");
         }
     }
 
@@ -258,9 +258,9 @@ 
             $SSPconfig = \SimpleSAML_Configuration::getInstance();
             $sspVersion = explode('.', $SSPconfig->getVersion());
             if ((int) $sspVersion[0] >= $this->ssp_needversion['major'] && (int) $sspVersion[1] >= $this->ssp_needversion['minor']) {
-                $this->testReturn(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running " . implode('.', $sspVersion));
+                $this->testReturn(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running ".implode('.', $sspVersion));
             } else {
-                $this->testReturn(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->ssp_needversion));
+                $this->testReturn(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->ssp_needversion));
             }
         }
     }
@@ -314,8 +314,8 @@ 
      * @return void
      */
     private function logdir_test() {
-        if (fopen(CONFIG['PATHS']['logdir'] . "/debug.log", "a") == FALSE) {
-            $this->testReturn(\core\common\Entity::L_WARN, "Log files in <strong>" . CONFIG['PATHS']['logdir'] . "</strong> are not writable!");
+        if (fopen(CONFIG['PATHS']['logdir']."/debug.log", "a") == FALSE) {
+            $this->testReturn(\core\common\Entity::L_WARN, "Log files in <strong>".CONFIG['PATHS']['logdir']."</strong> are not writable!");
         } else {
             $this->testReturn(\core\common\Entity::L_OK, "Log directory is writable.");
         }
@@ -346,7 +346,7 @@ 
         }
 
         // on CentOS and RHEL 8, look for Gmagick, else Imagick
-        if (strpos(php_uname("r"),"el8") !== FALSE) {
+        if (strpos(php_uname("r"), "el8") !== FALSE) {
             $classname = 'Gmagick';
         } else {
             $classname = 'Imagick';
@@ -445,7 +445,7 @@ 
     private function openssl_test() {
         $A = $this->getExecPath('openssl');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' version');
+            $t = exec($A['exec'].' version');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->testReturn(\core\common\Entity::L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
             } else {
@@ -472,14 +472,14 @@ 
         }
         $A = $this->getExecPath('makensis');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' -VERSION');
+            $t = exec($A['exec'].' -VERSION');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->testReturn(\core\common\Entity::L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
             } else {
                 $this->testReturn(\core\common\Entity::L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
             }
             $outputArray = [];
-            exec($A['exec'] . ' -HELP', $outputArray);
+            exec($A['exec'].' -HELP', $outputArray);
             $t1 = count(preg_grep('/INPUTCHARSET/', $outputArray));
             if ($t1 == 1 && CONFIG_CONFASSISTANT['NSIS_VERSION'] == 2) {
                 $this->testReturn(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
@@ -508,7 +508,7 @@ 
         $NSIS_Module_status = [];
         foreach ($this->NSIS_Modules as $module) {
             unset($out);
-            exec(CONFIG_CONFASSISTANT['PATHS']['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
+            exec(CONFIG_CONFASSISTANT['PATHS']['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
             if ($retval > 0) {
                 $NSIS_Module_status[$module] = 0;
             } else {
@@ -571,8 +571,8 @@ 
         $locales = shell_exec("locale -a");
         $allthere = "";
         foreach (CONFIG['LANGUAGES'] as $onelanguage) {
-            if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0) {
-                $allthere .= $onelanguage['locale'] . " ";
+            if (preg_match("/".$onelanguage['locale']."/", $locales) == 0) {
+                $allthere .= $onelanguage['locale']." ";
             }
         }
         if ($allthere == "") {
@@ -586,47 +586,47 @@ 
         ["SETTING" => CONFIG['APPEARANCE']['from-mail'],
             "DEFVALUE" => "cat-invite@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/from-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['url'],
             "DEFVALUE" => "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['display'],
             "DEFVALUE" => "cat-support@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['developer-mail'],
             "DEFVALUE" => "cat-develop@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['abuse-mail'],
             "DEFVALUE" => "my-abuse-contact@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['MOTD'],
             "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
             "COMPLAINTSTRING" => "APPEARANCE/MOTD ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['webcert_CRLDP'],
             "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['APPEARANCE']['webcert_OCSP'],
             "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/INST ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/USER ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['EXTERNAL']['host'],
             "DEFVALUE" => "customerdb.otherhost.example",
             "COMPLAINTSTRING" => "DB/EXTERNAL ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
     ];
 
     /**
@@ -652,11 +652,11 @@ 
 
         foreach (CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-clientcerts'] as $cadata) {
             foreach ($cadata['certificates'] as $cert_files) {
-                if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['public']) === FALSE) {
-                    $defaultvalues .= "CERTIFICATE/" . $cert_files['public'] . " ";
+                if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['public']) === FALSE) {
+                    $defaultvalues .= "CERTIFICATE/".$cert_files['public']." ";
                 }
-                if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['private']) === FALSE) {
-                    $defaultvalues .= "CERTIFICATE/" . $cert_files['private'] . " ";
+                if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['private']) === FALSE) {
+                    $defaultvalues .= "CERTIFICATE/".$cert_files['private']." ";
                 }
             }
         }
@@ -746,14 +746,14 @@ 
         if ($global_no_cache) {
             foreach ($Devs as $dev => $D) {
                 if (empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
         } else {
             foreach ($Devs as $dev => $D) {
                 if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
@@ -791,13 +791,13 @@ 
         $mail->isHTML(FALSE);
         $mail->CharSet = 'UTF-8';
         $mail->From = CONFIG['APPEARANCE']['from-mail'];
-        $mail->FromName = CONFIG['APPEARANCE']['productname'] . " Invitation System";
+        $mail->FromName = CONFIG['APPEARANCE']['productname']." Invitation System";
         $mail->addAddress(CONFIG['APPEARANCE']['abuse-mail']);
         $mail->Subject = "testing CAT configuration mail";
         $mail->Body = "Testing CAT mailing\n";
         $sent = $mail->send();
         if ($sent) {
-            $this->testReturn(\core\common\Entity::L_OK, "mailer settings appear to be working, check " . CONFIG['APPEARANCE']['abuse-mail'] . " mailbox if the message was receiced.");
+            $this->testReturn(\core\common\Entity::L_OK, "mailer settings appear to be working, check ".CONFIG['APPEARANCE']['abuse-mail']." mailbox if the message was receiced.");
         } else {
             $this->testReturn(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
         }