GEANT / CAT

core/DeviceConfig.php

Spacing +20 added lines, -20 removed lines

@@ -85,7 +85,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);
     }
 
@@ -137,7 +137,7 @@ 
                     break 2;
                 }
             }
-            $longestSuffix = $candidate . $longestSuffix;
+            $longestSuffix = $candidate.$longestSuffix;
         }
         return $longestSuffix;
     }
@@ -175,7 +175,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
@@ -200,8 +200,8 @@ 
         // create temporary directory, its full path will be saved in $this->FPATH;
         $tempDir = \core\common\Entity::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'])) {
@@ -239,7 +239,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();
@@ -299,10 +299,10 @@ 
      */
     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;
@@ -426,19 +426,19 @@ 
      */
     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
         // if an instshortname is set, base on that, otherwise, the normal instname
         $attribToUse = (isset($this->attributes['general:instshortname']) ? 'general:instshortname' : 'general:instname');
         $lang_pointer = \config\Master::LANGUAGES[$this->languageInstance->getLang()]['latin_based'] == TRUE ? 0 : 1;
-        $this->loggerInstance->debug(5, "getInstallerBasename1:" . $this->attributes[$attribToUse][$lang_pointer] . "\n");
+        $this->loggerInstance->debug(5, "getInstallerBasename1:".$this->attributes[$attribToUse][$lang_pointer]."\n");
         $inst = $this->customTranslit($this->attributes[$attribToUse][$lang_pointer]);
         $this->loggerInstance->debug(4, "getInstallerBasename2:$inst\n");
         $Inst_a = explode('_', $inst);
@@ -453,10 +453,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;
     }
 
     /**
@@ -640,7 +640,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");
@@ -667,13 +667,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]);
     }
 
     /**
@@ -727,9 +727,9 @@ 
     {
         $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;

devices/ms/Files/common.inc

Spacing +33 added lines, -33 removed lines

@@ -141,10 +141,10 @@ 
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")),\config\ConfAssistant::CONSORTIUM['display_name'])?>"
-!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis( _("Installation complete"))?>"
-!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(  _("Your system is ready."))?>"
-!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis( _("Please contact \${SUPPORT}."))?>"
+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")), \config\ConfAssistant::CONSORTIUM['display_name'])?>"
+!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis(_("Installation complete"))?>"
+!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Your system is ready."))?>"
+!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Please contact \${SUPPORT}."))?>"
 ;--------------------------------
 ;Languages
 !insertmacro MUI_LANGUAGE "${LANG}"
@@ -152,14 +152,14 @@ 
 ;--------------------------------
 ; License file
 !ifdef LICENSE_FILE
-LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis( _("Accept"))?>"
+LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis(_("Accept"))?>"
 LicenseText "<?php WindowsCommon::echoNsis(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
 LicenseData ${LICENSE_FILE}
 !endif
 
 ;-----------------------------------
 
-MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis( _("Finish"))?>"
+MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis(_("Finish"))?>"
 ;----------------------------------
 ;  FUNCTIONS
 
@@ -192,7 +192,7 @@ 
 
 !macro install_ca_cert ca_file ca_fingerprint level
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
-   DetailPrint "<?php WindowsCommon::echoNsis( _("searching for certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echoNsis(_("searching for certificate"))?> ${ca_file}"
    File "${ca_file}"
    nsArray::Set Delete_files "${ca_file}"
    !insertmacro debug_cat 2 "Testing machine store root"
@@ -254,13 +254,13 @@ 
    ${EndIf}
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
-   DetailPrint "<?php WindowsCommon::echoNsis( _("installing certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echoNsis(_("installing certificate"))?> ${ca_file}"
    nsExec::Exec '"certutil" -addstore -user ${level} "$TEMP"\${ca_file}'
    Pop $0
    !insertmacro debug_cat 3 "certutil returned $0"
    ${If} $0 != 0
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("could not install certificate"))?>  ${ca_file}"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("could not install certificate"))?>  ${ca_file}"
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
    ${EndIf}
 no_install_${ca_file}:
@@ -467,26 +467,26 @@ 
   pop $R0
   ${If} $tkip_count > 0
     ${If} $aes_count > 1
-      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
+      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
     ${Else}
-     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
+     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
     ${EndIf}
   ${Else}
     StrCpy $R1 ""
   ${EndIf}
   ${If} $profile_count > 0
-    StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echoNsis( _("The installer will create the following wireless profiles:"))?>$\r$\n\
+    StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echoNsis(_("The installer will create the following wireless profiles:"))?>$\r$\n\
 $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${Else}
-StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echoNsis( _("The installer will create the wireless profile:"))?> $R0.\
+StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echoNsis(_("The installer will create the wireless profile:"))?> $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${EndIf}
@@ -512,7 +512,7 @@ 
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
 ;TRANSLATION
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
-$\r$\n$\r$\n<?php WindowsCommon::echoNsis( _("Installer created with software from the GEANT project."))?>"
+$\r$\n$\r$\n<?php WindowsCommon::echoNsis(_("Installer created with software from the GEANT project."))?>"
   Pop $TEXT
 
   SetCtlColors $DIALOG "" 0xffffff
@@ -645,18 +645,18 @@ 
     ${If} $wireless_result == 1
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
     ${If} $wireless_result == 2
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
   ${Else}
     ${If} $wireless_result > 0
        IfSilent +3
-       MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
+       MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
        Call Cleanup
        wired_yes:
        Push 1
@@ -672,7 +672,7 @@ 
     ${If} $wired == 1
       ${If} $force_wired == 0
         IfSilent wired
-        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
+        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
         Push 0
         Pop $wired
         wired:
@@ -713,7 +713,7 @@ 
 ;================================
 
 Function ShowInstfiles
-  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Profiles installation"))?>" " "
+  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Profiles installation"))?>" " "
 FunctionEnd
 ;================================
 ;  Check if a wireless profile exist and put it on delete list
@@ -732,7 +732,7 @@ 
 
 Function FindProfile
   Pop $R8
-  DetailPrint "<?php WindowsCommon::echoNsis( _("Checking for profile \$R8"))?>"
+  DetailPrint "<?php WindowsCommon::echoNsis(_("Checking for profile \$R8"))?>"
   !insertmacro debug_cat 2 "Checking for profile $R8"
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
@@ -740,7 +740,7 @@ 
   !insertmacro debug_cat 4 "netsh returned $0"
   ${If} $0 == 0
     !insertmacro debug_cat 1 "found profile $R8"
-    DetailPrint "<?php WindowsCommon::echoNsis( _("found profile \$R8"))?>"
+    DetailPrint "<?php WindowsCommon::echoNsis(_("found profile \$R8"))?>"
     Push 0
   ${Else}
     !insertmacro debug_cat 1 "profile $R8 not found"
@@ -835,7 +835,7 @@ 
     ${If} $Symantec_installed  != 0
      !insertmacro debug_cat 3 "Symantec problem"
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")),\config\ConfAssistant::CONSORTIUM['display_name']) ?>"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")), \config\ConfAssistant::CONSORTIUM['display_name']) ?>"
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
     Quit
 
@@ -1128,7 +1128,7 @@ 
 Function PFXCertificateSelect
   !ifndef SILVERBULLET
 ;TRANSLATION
-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")),\config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")), \config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
 ;TRANSLATION
     IfSilent +2
   MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echoNsis(_("Click OK to continue"))?> "
@@ -1144,7 +1144,7 @@ 
         $certPasswordLength = strlen($certPasswordLabel);
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
         $certUsernameLength = strlen($certUsernameLabel);
-        $labelLength = max($certPasswordLength,$certUsernameLength);
+        $labelLength = max($certPasswordLength, $certUsernameLength);
   ?>
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
   !else
@@ -1161,11 +1161,11 @@ 
   !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
   ${If} $VistaNoSP == 0
     !ifdef PFX_USERNAME
-       !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
-       !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
+       !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
     !else
-       !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u"
-       !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u"
+       !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u"
     !endif
     ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
     ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
@@ -1537,7 +1537,7 @@ 
 Section "-start"
 SectionIn RO
 
-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Installation"))?>" "<?php WindowsCommon::echoNsis( _("Checking for existing wireless profiles"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Installation"))?>" "<?php WindowsCommon::echoNsis(_("Checking for existing wireless profiles"))?>"
 !ifndef PWD
 !include "certs.nsh"
 !endif

web/lib/user/TextTemplates.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 const DOWNLOAD_REDIRECT_CONTINUE = 1054;
 const SB_GO_AWAY = 1060;
 const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061;
-const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062;
+const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062;
 
 
 /**
@@ -96,14 +96,14 @@ 
                       "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/",
                     ]
             ] as $consortium => $terms) {
-            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU'], $terms['PRIV']);
+            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>"._("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.")."</p>", $consortium, $terms['TOU'], $terms['PRIV']);
         }
         // this would actually be a checkbox which grays out the actual download button until ACKed
         $this->templates[WELCOME_ABOARD_TERMS] .= "<p>"._("I agree to be bound by these Terms and Conditions.")."</p>";
         $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads");
         $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("we would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']);
-        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),\config\ConfAssistant::CONSORTIUM['display_name']);
+        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation");
         $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']);

core/SanityTests.php

Spacing +44 added lines, -44 removed lines

@@ -129,7 +129,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->profileOptionCount = 0;
         $passedTheWindmill = FALSE;
         foreach ($schema as $schemaLine) {
@@ -156,7 +156,7 @@ 
     {
         $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->storeTestResult(\core\common\Entity::L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
@@ -269,9 +269,9 @@ 
     private function testPhp()
     {
         if (version_compare(phpversion(), $this->needversionPHP, '>=')) {
-            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
         } else {
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have " . phpversion() . ".");
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have ".phpversion().".");
         }
     }
     
@@ -284,12 +284,12 @@ 
      */
     private function runConstantsTest($config)
     {
-        $templateConfig = file_get_contents(ROOT . "/config/$config-template.php");
-        $newTemplateConfig = preg_replace("/class *$config/", "class $config" . "_template", $templateConfig);
-        file_put_contents(ROOT . "/var/tmp/$config-template.php", $newTemplateConfig);
-        include(ROOT . "/var/tmp/$config-template.php");
-        unlink(ROOT . "/var/tmp/$config-template.php");
-        $rft = new \ReflectionClass("\config\\$config" . "_template");
+        $templateConfig = file_get_contents(ROOT."/config/$config-template.php");
+        $newTemplateConfig = preg_replace("/class *$config/", "class $config"."_template", $templateConfig);
+        file_put_contents(ROOT."/var/tmp/$config-template.php", $newTemplateConfig);
+        include(ROOT."/var/tmp/$config-template.php");
+        unlink(ROOT."/var/tmp/$config-template.php");
+        $rft = new \ReflectionClass("\config\\$config"."_template");
         $templateConstants = $rft->getConstants();
         $failResults = [];
         foreach ($templateConstants as $constant => $value) {
@@ -306,7 +306,7 @@ 
      * Check if all required constants are set
      */
     private function testConfigConstants() {
-        set_error_handler(function ($severity, $message, $file, $line) {
+        set_error_handler(function($severity, $message, $file, $line) {
             throw new \ErrorException($message, $severity, $severity, $file, $line);
         });
         
@@ -317,7 +317,7 @@ 
             $failCount = $failCount + count($failResults);
             if (count($failResults) > 0) {
             $this->storeTestResult(\core\common\Entity::L_ERROR, 
-                    "<strong>The following constants are not set:</strong>" . implode(', ', $failResults));
+                    "<strong>The following constants are not set:</strong>".implode(', ', $failResults));
             }
         }
         
@@ -341,7 +341,7 @@ 
             $this->storeTestResult(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
         } else {
             $rootFromScript = $m[1] === '' ? '/' : $m[1];
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>" . \config\Master::PATHS['cat_base_url'] . "</strong> and should be <strong>$rootFromScript</strong>");
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>".\config\Master::PATHS['cat_base_url']."</strong> and should be <strong>$rootFromScript</strong>");
         }
     }
 
@@ -362,7 +362,7 @@ 
         if (count($probeReturns) == 0) {
             $this->storeTestResult(common\Entity::L_OK, "All configured RADIUS/UDP probes are reachable.");
         } else {
-            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: " . implode(', ', $probeReturns));
+            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: ".implode(', ', $probeReturns));
         }
     }
 
@@ -380,9 +380,9 @@ 
             $SSPconfig = \SimpleSAML\Configuration::getInstance();
             $sspVersion = explode('.', $SSPconfig->getVersion());
             if ((int) $sspVersion[0] >= $this->needversionSSP['major'] && (int) $sspVersion[1] >= $this->needversionSSP['minor']) {
-                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running " . implode('.', $sspVersion));
+                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running ".implode('.', $sspVersion));
             } else {
-                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->needversionSSP));
+                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->needversionSSP));
             }
         }
     }
@@ -440,8 +440,8 @@ 
      */
     private function testLogdir()
     {
-        if (fopen(\config\Master::PATHS['logdir'] . "/debug.log", "a") == FALSE) {
-            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>" . \config\Master::PATHS['logdir'] . "</strong> are not writable!");
+        if (fopen(\config\Master::PATHS['logdir']."/debug.log", "a") == FALSE) {
+            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>".\config\Master::PATHS['logdir']."</strong> are not writable!");
         } else {
             $this->storeTestResult(\core\common\Entity::L_OK, "Log directory is writable.");
         }
@@ -473,7 +473,7 @@ 
         }
 
         $classname = 'Imagick';
-        if (class_exists('\\' . $classname)) {
+        if (class_exists('\\'.$classname)) {
             $this->storeTestResult(\core\common\Entity::L_OK, "PHP extension <strong>Imagick</strong> is installed.");
         } else {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
@@ -569,7 +569,7 @@ 
     {
         $A = $this->getExecPath('openssl');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' version');
+            $t = exec($A['exec'].' version');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
             } else {
@@ -597,14 +597,14 @@ 
         }
         $A = $this->getExecPath('makensis');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' -VERSION');
+            $t = exec($A['exec'].' -VERSION');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
             } else {
                 $this->storeTestResult(\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->storeTestResult(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
@@ -634,7 +634,7 @@ 
         $NSIS_Module_status = [];
         foreach ($this->NSISModules 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 {
@@ -701,8 +701,8 @@ 
         $locales = shell_exec("locale -a");
         $allthere = "";
         foreach (\config\Master::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 == "") {
@@ -716,47 +716,47 @@ 
         ["SETTING" => \config\Master::APPEARANCE['from-mail'],
             "DEFVALUE" => "cat-invite@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/from-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::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\Master::APPEARANCE['support-contact']['display'],
             "DEFVALUE" => "cat-support@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['developer-mail'],
             "DEFVALUE" => "cat-develop@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['abuse-mail'],
             "DEFVALUE" => "my-abuse-contact@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['MOTD'],
             "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
             "COMPLAINTSTRING" => "APPEARANCE/MOTD ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['webcert_CRLDP'],
             "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::APPEARANCE['webcert_OCSP'],
             "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/INST ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/USER ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['EXTERNAL']['host'],
             "DEFVALUE" => "customerdb.otherhost.example",
             "COMPLAINTSTRING" => "DB/EXTERNAL ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
     ];
 
     /**
@@ -785,11 +785,11 @@ 
         if (isset(\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'])) {
             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']." ";
                     }
                 }
             }
@@ -882,14 +882,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++;
                 }
             }
@@ -928,13 +928,13 @@ 
         $mail->isHTML(FALSE);
         $mail->CharSet = 'UTF-8';
         $mail->From = \config\Master::APPEARANCE['from-mail'];
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
         $mail->addAddress(\config\Master::APPEARANCE['abuse-mail']);
         $mail->Subject = "testing CAT configuration mail";
         $mail->Body = "Testing CAT mailing\n";
         $sent = $mail->send();
         if ($sent) {
-            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check " . \config\Master::APPEARANCE['abuse-mail'] . " mailbox if the message was receiced.");
+            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check ".\config\Master::APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
         } else {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
         }

devices/apple_mobileconfig/MobileconfigSuperclass.php

Spacing +49 added lines, -49 removed lines

@@ -179,15 +179,15 @@ 
       <key>PayloadDescription</key>
          <string>$tagline</string>
       <key>PayloadDisplayName</key>
-         <string>" . \config\ConfAssistant::CONSORTIUM['display_name'] . "</string>
+         <string>".\config\ConfAssistant::CONSORTIUM['display_name']."</string>
       <key>PayloadIdentifier</key>
-         <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
+         <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8').($this->attributes['internal:profile_count'][0] > 1 ? " (".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8').")" : "")."</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
-         <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX . $this->massagedConsortium . $this->massagedCountry . $this->massagedInst . $this->massagedProfile) . "</string>
+         <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX.$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile)."</string>
       <key>PayloadVersion</key>
          <integer>1</integer>";
         \core\common\Entity::outOfThePotatoes();
@@ -219,21 +219,21 @@ 
     {
         \core\common\Entity::intoThePotatoes();
         if (isset($this->attributes['support:info_file'])) {
-            return MobileconfigSuperclass::BUFFER_CONSENT_PRE . htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8') . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+            return MobileconfigSuperclass::BUFFER_CONSENT_PRE.htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8').MobileconfigSuperclass::BUFFER_CONSENT_POST;
         }
         if ($this->attributes['internal:verify_userinput_suffix'][0] != 0) {
             if ($this->attributes['internal:hint_userinput_suffix'][0] != 0) {
-                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
                 \core\common\Entity::outOfThePotatoes();
                 return $retval;
             } else { 
             if (strlen($this->attributes['internal:realm'][0]) > 0) {
                 /// note space between variable and exclamation mark - makes sure users don't mistakenly think the exclamation mark is part of the required username!
-                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
                 \core\common\Entity::outOfThePotatoes();
                 return $retval;
             }
-            $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . _("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.") . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+            $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE._("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.").MobileconfigSuperclass::BUFFER_CONSENT_POST;
             \core\common\Entity::outOfThePotatoes();
             return $retval;
             }
@@ -257,7 +257,7 @@ 
         // also escape htmlspecialchars
         // not all names and profiles have a name, so be prepared
 
-        $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
+        $this->loggerInstance->debug(5, "List of available attributes: ".var_export($this->attributes, TRUE));
 
         $this->instName = $this->attributes['general:instname'][0] ?? _("Unnamed Organisation");
         $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
@@ -299,7 +299,7 @@ 
 
         file_put_contents('installer_profile', $outputXml);
 
-        $fileName = $this->installerBasename . '.mobileconfig';
+        $fileName = $this->installerBasename.'.mobileconfig';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -307,7 +307,7 @@ 
             return $fileName;
         }
         // still here? Then we are signing.
-        $signing = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $signing = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($signing === FALSE) {
             $this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n");
         }
@@ -326,19 +326,19 @@ 
         \core\common\Entity::intoThePotatoes();
         $ssidCount = count($this->attributes['internal:SSID']);
         $certCount = count($this->attributes['internal:CAs'][0]);
-        $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>";
+        $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>";
         $out .= "<p>";
         $out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:");
         $out .= "<ul>";
-        $out .= "<li>" . _("to install the profile") . "</li>";
-        $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
+        $out .= "<li>"._("to install the profile")."</li>";
+        $out .= "<li>".ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
         if ($certCount > 1) {
-            $out .= " " . sprintf(_("(%d times)"), $certCount);
+            $out .= " ".sprintf(_("(%d times)"), $certCount);
         }
         $out .= "</li>";
-        $out .= "<li>" . _("to enter the username and password you have been given by your organisation");
+        $out .= "<li>"._("to enter the username and password you have been given by your organisation");
         if ($ssidCount > 1) {
-            $out .= " " . sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssidCount, \config\ConfAssistant::CONSORTIUM['display_name'], $ssidCount);
+            $out .= " ".sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssidCount, \config\ConfAssistant::CONSORTIUM['display_name'], $ssidCount);
         }
         $out .= "</li>";
         $out .= "</ul>";
@@ -378,7 +378,7 @@ 
                <key>ServiceProviderRoamingEnabled</key>
                <true/>
                <key>DisplayedOperatorName</key>
-               <string>" . \config\ConfAssistant::CONSORTIUM['display_name'] . " via Passpoint</string>";
+               <string>" . \config\ConfAssistant::CONSORTIUM['display_name']." via Passpoint</string>";
         // if we don't know the realm, omit the entire DomainName key
         if (isset($this->attributes['internal:realm'])) {
             $retval .= "<key>DomainName</key>
@@ -390,7 +390,7 @@ 
         $retval .= "                <key>RoamingConsortiumOIs</key>
                 <array>";
 
-        $retval .= "<string>" . strtoupper($consortiumOi) . "</string>";
+        $retval .= "<string>".strtoupper($consortiumOi)."</string>";
 
         $retval .= "</array>";
         // this is an undocumented value found on the net. Does it do something useful?
@@ -427,7 +427,7 @@ 
                   <dict>
                       <key>AcceptEAPTypes</key>
                          <array>
-                            <integer>" . $eapType['OUTER'] . "</integer>
+                            <integer>" . $eapType['OUTER']."</integer>
                          </array>
                       <key>EAPFASTProvisionPAC</key>
                             <true />
@@ -440,7 +440,7 @@ 
 ";
         if ($realm !== NULL) {
             $retval .= "<key>OuterIdentity</key>
-                                    <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string>
+                                    <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8')."</string>
 ";
         }
         $retval .= "<key>PayloadCertificateAnchorUUID</key>
@@ -464,11 +464,11 @@ 
         $retval .= "
                          </array>";
         if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
-            $retval .= "<key>UserName</key><string>" . $this->clientCert["certObject"]->username . "</string>";
+            $retval .= "<key>UserName</key><string>".$this->clientCert["certObject"]->username."</string>";
         }
         $retval .= "
                       <key>TTLSInnerAuthentication</key>
-                         <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2") . "</string>
+                         <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2")."</string>
                    </dict>";
         return $retval;
     }
@@ -488,9 +488,9 @@ 
             // characters are still reversed, invert on use!
             $buffer .= "<string>Manual</string>
                   <key>ProxyServer</key>
-                  <string>" . strrev($serverAndPort[1]) . "</string>
+                  <string>" . strrev($serverAndPort[1])."</string>
                   <key>ProxyServerPort</key>
-                  <integer>" . strrev($serverAndPort[0]) . "</integer>
+                  <integer>" . strrev($serverAndPort[0])."</integer>
                   <key>ProxyPACFallbackAllowed</key>
                   <false/>";
         } else {
@@ -519,7 +519,7 @@ 
                     throw new Exception("SSID must be a string!");
                 }
                 $escapedSSID = htmlspecialchars($toBeConfigured, ENT_XML1, 'UTF-8');
-                $payloadIdentifier = "wifi." . $this->serial;
+                $payloadIdentifier = "wifi.".$this->serial;
                 $payloadShortName = sprintf(_("SSID %s"), $escapedSSID);
                 $payloadName = sprintf(_("%s configuration for network name %s"), \config\ConfAssistant::CONSORTIUM['display_name'], $escapedSSID);
                 $encryptionTypeString = "WPA";
@@ -549,7 +549,7 @@ 
                 $payloadIdentifier = "hs20.$toBeConfigured";
                 $knownOiName = array_search($toBeConfigured, \config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']);
                 if ($knownOiName === FALSE) { // a custom RCOI as set by the IdP admin; do not use the term "eduroam" in that one!
-                    $knownOiName = $this->instName . " "._("Roaming Partner");
+                    $knownOiName = $this->instName." "._("Roaming Partner");
                 }
                 $payloadShortName = $knownOiName;
                 $payloadName = _("Passpoint roaming configuration ($knownOiName)");
@@ -571,11 +571,11 @@ 
                <key>PayloadDisplayName</key>
                   <string>$payloadShortName</string>
                <key>PayloadIdentifier</key>
-                  <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
+                  <string>".self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
                <key>PayloadOrganization</key>
-                  <string>" . $this->massagedConsortium . ".1x-config.org</string>
+                  <string>".$this->massagedConsortium.".1x-config.org</string>
                <key>PayloadType</key>
-                  <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi") . ".managed</string>";
+                  <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi").".managed</string>";
         $retval .= $this->proxySettings();
         $retval .= $setupModesString;
         if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
@@ -587,7 +587,7 @@ 
         }
         $retval .= "
                <key>PayloadUUID</key>
-                  <string>" . \core\common\Entity::uuid() . "</string>
+                  <string>" . \core\common\Entity::uuid()."</string>
                <key>PayloadVersion</key>
                   <integer>1</integer>
                   $wifiNetworkIdentification</dict>";
@@ -617,15 +617,15 @@ 
 	<key>IsHotspot</key>
 	<false/>
 	<key>PayloadDescription</key>
-	<string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</string>
+	<string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name'])."</string>
 	<key>PayloadDisplayName</key>
-	<string>" . _("Disabled WiFi network") . "</string>
+	<string>" . _("Disabled WiFi network")."</string>
 	<key>PayloadIdentifier</key>
-	<string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
+	<string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
 	<key>PayloadType</key>
 	<string>com.apple.wifi.managed</string>
 	<key>PayloadUUID</key>
-	<string>" . \core\common\Entity::uuid() . "</string>
+	<string>".\core\common\Entity::uuid()."</string>
 	<key>PayloadVersion</key>
 	<real>1</real>";
         $retval .= $this->proxySettings();
@@ -704,12 +704,12 @@ 
         $mimeBlob = base64_encode($binaryBlob);
         $mimeFormatted = chunk_split($mimeBlob, 52, "\r\n");
         $payloadUUID = \core\common\Entity::uuid('', $mimeBlob);
-        $retArray = ["block" => "<dict>" .
+        $retArray = ["block" => "<dict>".
             // we don't include the import password. It's displayed on screen, and should be input by the user.
             // <key>Password</key>
             //   <string>" . $this->clientCert['password'] . "</string>
             "<key>PayloadCertificateFileName</key>
-                     <string>" . $this->massagedConsortium . ".pfx</string>
+                     <string>" . $this->massagedConsortium.".pfx</string>
                   <key>PayloadContent</key>
                      <data>
 $mimeFormatted
@@ -717,7 +717,7 @@ 
                   <key>PayloadDescription</key>
                      <string>MIME Base-64 encoded PKCS#12 Client Certificate</string>
                   <key>PayloadDisplayName</key>
-                     <string>" . _("User certificate") . "</string>
+                     <string>"._("User certificate")."</string>
                   <key>PayloadIdentifier</key>
                      <string>com.apple.security.pkcs12.$payloadUUID</string>
                   <key>PayloadType</key>
@@ -727,7 +727,7 @@ 
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
         \core\common\Entity::outOfThePotatoes();
         return $retArray;
     }
@@ -745,7 +745,7 @@ 
         }
         $expiryTime = new \DateTime($this->clientCert['certObject']->expiry);
         return "<key>RemovalDate</key>
-        <date>" . $expiryTime->format("Y-m-d") . "T" . $expiryTime->format("H:i:s") . "Z</date>";
+        <date>" . $expiryTime->format("Y-m-d")."T".$expiryTime->format("H:i:s")."Z</date>";
     }
 
     /**
@@ -767,27 +767,27 @@ 
             $stream = "
             <dict>
                <key>PayloadCertificateFileName</key>
-               <string>" . $ca['uuid'] . ".der</string>
+               <string>" . $ca['uuid'].".der</string>
                <key>PayloadContent</key>
                <data>
-" . $trimmedPem . "</data>
+" . $trimmedPem."</data>
                <key>PayloadDescription</key>
-               <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_inst) . "</string>
+               <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_inst)."</string>
                <key>PayloadDisplayName</key>
                <string>" . 
                     /// example: "Identity Provider CA #1 (Root)"
-                    sprintf(_("%s CA #%d (%s)" ), 
+                    sprintf(_("%s CA #%d (%s)"), 
                             \core\common\Entity::$nomenclature_inst, 
-                            count($this->CAsAccountedFor)+1, 
-                            ($ca['root'] ? _("Root") : _("Intermediate"))) . 
+                            count($this->CAsAccountedFor) + 1, 
+                            ($ca['root'] ? _("Root") : _("Intermediate"))). 
               "</string>
                <key>PayloadIdentifier</key>
-               <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
+               <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
                <key>PayloadOrganization</key>
-               <string>" . $this->massagedConsortium . ".1x-config.org</string>
+               <string>".$this->massagedConsortium.".1x-config.org</string>
                <key>PayloadType</key>
                <string>com.apple.security.root</string>
-               <key>PayloadUUID</key><string>" . $ca['uuid'] . "</string>
+               <key>PayloadUUID</key><string>" . $ca['uuid']."</string>
                <key>PayloadVersion</key>
                <integer>1</integer>
             </dict>";

web/lib/admin/UIElements.php

Spacing +33 added lines, -33 removed lines

@@ -136,7 +136,7 @@ 
             sprintf(_("%s: Do not terminate EAP"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-noterm",
             sprintf(_("%s: max users per profile"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-maxusers",
             sprintf(_("Mint %s with CA on creation"), $this->nomenclatureInst) => "fed:minted_ca_file",
-            sprintf(_("OpenRoaming: Allow %s Opt-In"),$this->nomenclatureParticipant) => "fed:openroaming",
+            sprintf(_("OpenRoaming: Allow %s Opt-In"), $this->nomenclatureParticipant) => "fed:openroaming",
             _("OpenRoaming: Custom NAPTR Target") => "fed:openroaming_customtarget",
             $ssidText => "media:SSID",
             $passpointOiText => "media:consortium_OI",
@@ -148,7 +148,7 @@ 
         $find = array_keys($displayNames, $input, TRUE);
 
         if (count($find) == 0) { // this is an error! throw an Exception
-            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: " . htmlentities($input));
+            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: ".htmlentities($input));
         }
         \core\common\Entity::outOfThePotatoes();
         return $find[0];
@@ -169,7 +169,7 @@ 
 
         foreach ($optionlist as $option) {
             $type = $optioninfo->optionType($option['name']);
-            if (preg_match('/^' . $class . '/', $option['name']) && $option['level'] == "$level") {
+            if (preg_match('/^'.$class.'/', $option['name']) && $option['level'] == "$level") {
                 // all non-multilang attribs get this assignment ...
                 $language = "";
                 $content = $option['value'];
@@ -187,19 +187,19 @@ 
                         $locationMarkers[] = $coords;
                         break;
                     case "file":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td>";
                         switch ($option['name']) {
                             case "general:logo_file":
                             case "fed:logo_file":
-                                $retval .= $this->previewImageinHTML('ROWID-' . $option['level'] . '-' . $option['row']);
+                                $retval .= $this->previewImageinHTML('ROWID-'.$option['level'].'-'.$option['row']);
                                 break;
                             case "eap:ca_file":
                             // fall-through intended: display both the same way
                             case "fed:minted_ca_file":
-                                $retval .= $this->previewCAinHTML('ROWID-' . $option['level'] . '-' . $option['row']);
+                                $retval .= $this->previewCAinHTML('ROWID-'.$option['level'].'-'.$option['row']);
                                 break;
                             case "support:info_file":
-                                $retval .= $this->previewInfoFileinHTML('ROWID-' . $option['level'] . '-' . $option['row']);
+                                $retval .= $this->previewInfoFileinHTML('ROWID-'.$option['level'].'-'.$option['row']);
                                 break;
                             default:
                         }
@@ -209,10 +209,10 @@ 
                             // do not display the option at all; it gets auto-set by the ProfileSilverbullet constructor and doesn't have to be seen
                             break;
                         }
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>".($content == "on" ? _("on") : _("off"))."</strong></td></tr>";
                         break;
                     default:
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>$content</strong></td></tr>";
                 }
             }
         }
@@ -221,11 +221,11 @@ 
             $locationCount = 0;
             foreach ($locationMarkers as $g) {
                 $locationCount++;
-                $marker .= '<marker name="' . $locationCount . '" lat="' . $g['lat'] . '" lng="' . $g['lon'] . '" />';
+                $marker .= '<marker name="'.$locationCount.'" lat="'.$g['lat'].'" lng="'.$g['lon'].'" />';
             }
             $marker .= '<\/markers>'; // some validator says this should be escaped
             $jMarker = json_encode($locationMarkers);
-            $retval .= '<tr><td><script>markers=\'' . $marker . '\'; jmarkers = \'' . $jMarker . '\';</script></td><td></td><td></td></tr>';
+            $retval .= '<tr><td><script>markers=\''.$marker.'\'; jmarkers = \''.$jMarker.'\';</script></td><td></td><td></td></tr>';
         }
         \core\common\Entity::outOfThePotatoes();
         return $retval;
@@ -241,11 +241,11 @@ 
         \core\common\Entity::intoThePotatoes();
         $idpoptions = $myInst->getAttributes();
         $retval = "<div class='infobox'>
-        <h2>" . sprintf(_("General %s details"), $this->nomenclatureInst) . "</h2>
+        <h2>" . sprintf(_("General %s details"), $this->nomenclatureInst)."</h2>
         <table>
             <tr>
                 <td>
-                    " . _("Country:") . "
+                    " . _("Country:")."
                 </td>
                 <td>
                 </td>
@@ -255,16 +255,16 @@ 
         $retval .= $myFed->name;
         $retval .= "</strong>
                 </td>
-            </tr>" . $this->infoblock($idpoptions, "general", "IdP") . "
+            </tr>" . $this->infoblock($idpoptions, "general", "IdP")."
         </table>
     </div>";
 
         $blocks = [["support", _("Global Helpdesk Details")], ["media", _("Media Properties")]];
         foreach ($blocks as $block) {
             $retval .= "<div class='infobox'>
-            <h2>" . $block[1] . "</h2>
+            <h2>" . $block[1]."</h2>
             <table>" .
-                    $this->infoblock($idpoptions, $block[0], "IdP") .
+                    $this->infoblock($idpoptions, $block[0], "IdP").
                     "</table>
         </div>";
         }
@@ -279,12 +279,12 @@ 
      */
     private function displaySize(int $number) {
         if ($number > 1024 * 1024) {
-            return round($number / 1024 / 1024, 2) . " MiB";
+            return round($number / 1024 / 1024, 2)." MiB";
         }
         if ($number > 1024) {
-            return round($number / 1024, 2) . " KiB";
+            return round($number / 1024, 2)." KiB";
         }
-        return $number . " B";
+        return $number." B";
     }
 
     /**
@@ -338,7 +338,7 @@ 
         $ref = $validator->databaseReference($cAReference);
         $rawResult = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($rawResult)) { // we didn't actually get a CA!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the certificate from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the certificate from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
@@ -354,14 +354,14 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
-        $certTooltip = ( $details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
+        $certTooltip = ($details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
         if ($details['ca'] == 0 && $details['root'] != 1) {
-            $retval = "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
+            $retval = "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>"._("This is a <strong>SERVER</strong> certificate!")."<br/>".$details['name']."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
-        $retval = "<div class='ca-summary'                                ><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:#0000ff; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $details['name'] . "</div>";
+        $retval = "<div class='ca-summary'                                ><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:#0000ff; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>".$details['name']."</div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -374,7 +374,7 @@ 
      */
     public function previewImageinHTML($imageReference) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=" . $imageReference . "' alt='" . _("Preview of logo file") . "'/>";
+        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=".$imageReference."' alt='"._("Preview of logo file")."'/>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -391,13 +391,13 @@ 
         $ref = $validator->databaseReference($fileReference);
         $fileBlob = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($fileBlob)) { // we didn't actually get a file!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the file from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the file from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
         $decodedFileBlob = base64_decode($fileBlob);
         $fileinfo = new \finfo();
-        $retval = "<div class='ca-summary'>" . _("File exists") . " (" . $fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE) . ", " . $this->displaySize(strlen($decodedFileBlob)) . ")<br/><a href='inc/filepreview.php?id=$fileReference'>" . _("Preview") . "</a></div>";
+        $retval = "<div class='ca-summary'>"._("File exists")." (".$fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE).", ".$this->displaySize(strlen($decodedFileBlob)).")<br/><a href='inc/filepreview.php?id=$fileReference'>"._("Preview")."</a></div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -425,7 +425,7 @@ 
             $retval .= "<tr><td>";
         }
         $finalCaption = ($caption !== NULL ? $caption : $uiMessages[$level]['text']);
-        $retval .= "<img class='icon' src='" . $uiMessages[$level]['icon'] . "' alt='" . $finalCaption . "' title='" . $finalCaption . "'/>";
+        $retval .= "<img class='icon' src='".$uiMessages[$level]['icon']."' alt='".$finalCaption."' title='".$finalCaption."'/>";
         if (!$omittabletags) {
             $retval .= "</td><td>";
         }
@@ -507,8 +507,8 @@ 
             return "";
         }
 
-        $loggerInstance->debug(4, "Consortium logo is at: " . ROOT . "/web/resources/images/consortium_logo_large.png");
-        $logogd = imagecreatefrompng(ROOT . "/web/resources/images/consortium_logo_large.png");
+        $loggerInstance->debug(4, "Consortium logo is at: ".ROOT."/web/resources/images/consortium_logo_large.png");
+        $logogd = imagecreatefrompng(ROOT."/web/resources/images/consortium_logo_large.png");
         if ($logogd === FALSE) { // consortium logo is bogus; don't do anything
             return "";
         }
@@ -534,7 +534,7 @@ 
         imagecolorallocate($whiteimage, 255, 255, 255);
         // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
         $targetplacementx = (int) ($symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize + 1) / 2) / $symbolsize));
-        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1 ) / 2) / $symbolsize));
+        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1) / 2) / $symbolsize));
         imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
         imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]);
         ob_start();
@@ -584,9 +584,9 @@ 
                 $message = "Your configuration appears to be fine.";
                 break;
             default:
-                throw new Exception("The result code level " . $test->test_result['global'] . " is not defined!");
+                throw new Exception("The result code level ".$test->test_result['global']." is not defined!");
         }
-        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>" . $message . "<br>See below for details<br><hr>");
+        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
         foreach ($test->out as $testValue) {
             foreach ($testValue as $o) {
                 $out .= $this->boxFlexible($o['level'], $o['message']);

web/admin/edit_participant_result.php

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,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";
 
 $auth = new \web\lib\admin\Authentication();
 $loggerInstance = new \core\common\Logging();
@@ -33,15 +33,15 @@ 
 $myInstOriginal = $validator->existingIdP($_GET['inst_id'], $_SESSION['user']);
 $instId = $myInstOriginal->identifier;
 
-$hello = _("To whom it may concern,") . "\n\n";
-$bye = _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.") . "\n\n" .
-        _("Greetings, ") . "\n\n" .
+$hello = _("To whom it may concern,")."\n\n";
+$bye = _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.")."\n\n".
+        _("Greetings, ")."\n\n".
         \config\Master::APPEARANCE['productname_long'];
 
 switch ($_POST['submitbutton']) {
     case web\lib\common\FormElements::BUTTON_DELETE:
         $myInstOriginal->destroy();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP " . $instId);
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP ".$instId);
         header("Location: overview_user.php");
         exit;
     case web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART:
@@ -51,9 +51,9 @@ 
         }
         // flush all IdP attributes and send user to creation wizard
         $myInstOriginal->flushAttributes();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over" . $instId);
-        $text = $hello .
-                sprintf(_("the %s %s / %s / (previously known as) '%s' has deleted all properties and is starting over freshly. This means that its not recognisable by its name any more, and it may assume a different name in the future. You will get another mail if and when the name change happens."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n" .
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over".$instId);
+        $text = $hello.
+                sprintf(_("the %s %s / %s / (previously known as) '%s' has deleted all properties and is starting over freshly. This means that its not recognisable by its name any more, and it may assume a different name in the future. You will get another mail if and when the name change happens."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n".
                 $bye;
         $fed = new core\Federation($myInstOriginal->federation);
         foreach ($fed->listFederationAdmins() as $id) {
@@ -72,19 +72,19 @@ 
             exit(0);
         }
         $inst_name = $myInstOriginal->name;
-        echo "<h1>" . sprintf(_("Submitted attributes for IdP '%s'"), $inst_name) . "</h1>";
+        echo "<h1>".sprintf(_("Submitted attributes for IdP '%s'"), $inst_name)."</h1>";
         echo "<table>";
         echo $optionParser->processSubmittedFields($myInstOriginal, $_POST, $_FILES);
         echo "</table>";
 // delete cached logo, if present
-        $dir = ROOT . '/web/downloads/logos/';
-        $globResult = glob($dir . $myInstOriginal->identifier . "_*.png");
+        $dir = ROOT.'/web/downloads/logos/';
+        $globResult = glob($dir.$myInstOriginal->identifier."_*.png");
         if ($globResult === FALSE) { // we should catch the improbable error condition
             $globResult = [];
         }
         array_map('unlink', $globResult);
         $loggerInstance->debug(4, "UNLINK from $dir\n");
-        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP " . $myInstOriginal->identifier . " - attributes changed");
+        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP ".$myInstOriginal->identifier." - attributes changed");
 
 // re-instantiate ourselves... profiles need fresh data
         $myInstReinstantiated = $validator->existingIdP($_GET['inst_id'], $_SESSION['user']);
@@ -93,10 +93,10 @@ 
         if (count($significantChanges) > 0) {
             // send a notification/alert mail to someone we know is in charge
             /// were made to the *Identity Provider* *LU* / integer number of IdP / (previously known as) Name
-            $text = $hello . sprintf(_("significant changes were made to the %s %s / %s / (previously known as) '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n";
+            $text = $hello.sprintf(_("significant changes were made to the %s %s / %s / (previously known as) '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n";
             if (isset($significantChanges[\core\IdP::INSTNAME_CHANGED])) {
-                $text .= sprintf(_("The %s has changed its name. The details are below:"), $ui->nomenclatureInst) . "\n\n";
-                $text .= $significantChanges[\core\IdP::INSTNAME_CHANGED] . "\n\n";
+                $text .= sprintf(_("The %s has changed its name. The details are below:"), $ui->nomenclatureInst)."\n\n";
+                $text .= $significantChanges[\core\IdP::INSTNAME_CHANGED]."\n\n";
             }
             $text .= $bye;
             // (currently, send hard-wired to NRO - future: for linked insts, check eduroam DBv2 and send to registered admins directly)
@@ -112,12 +112,12 @@ 
 
         if (isset(\config\ConfAssistant::CONSORTIUM['ssid']) && count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
             foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssidname) {
-                $ssids[] = $ssidname . " " . _("(WPA2/AES)");
+                $ssids[] = $ssidname." "._("(WPA2/AES)");
             }
         }
 
         foreach ($myInstReinstantiated->getAttributes("media:SSID") as $ssidname) {
-            $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES)");
+            $ssids[] = $ssidname['value']." "._("(WPA2/AES)");
         }
 
         echo "<table>";
@@ -125,7 +125,7 @@ 
         if (count($ssids) > 0) {
             $printedlist = "";
             foreach ($ssids as $names) {
-                $printedlist = $printedlist . "$names ";
+                $printedlist = $printedlist."$names ";
             }
             echo $uiElements->boxOkay(sprintf(_("Your installers will configure the following SSIDs: <strong>%s</strong>"), $printedlist), _("SSIDs configured"));
         }
@@ -153,7 +153,7 @@ 
                 // did we get an email address? then, show the silverbullet jumpstart button
                 // otherwise, issue a smartass comment
                 if (count($myInstReinstantiated->getAttributes("support:email")) > 0) {
-                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>" . sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME) . "</button></form>";
+                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>".sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME)."</button></form>";
                 } else {
                     echo "<table>";
                     echo $uiElements->boxError(sprintf(_("You did not submit an e-mail address. This is required for %s. Please go to the %s dashboard and edit your helpdesk settings to include a helpdesk e-mail address."), core\ProfileSilverbullet::PRODUCTNAME, $ui->nomenclatureInst), _("No support e-mail!"));
@@ -161,10 +161,10 @@ 
                 }
             }
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<br/><form method='post' action='edit_profile.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to RADIUS/EAP profile definition") . "</button></form>";
+                echo "<br/><form method='post' action='edit_profile.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to RADIUS/EAP profile definition")."</button></form>";
             }
         }
-        echo "<br/><form method='post' action='overview_user.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+        echo "<br/><form method='post' action='overview_user.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
 
         break;
     default:

core/common/OutsideComm.php

Spacing +20 added lines, -20 removed lines

@@ -82,7 +82,7 @@ 
         $mail->WordWrap = 72;
         $mail->isHTML(FALSE);
         $mail->CharSet = 'UTF-8';
-        $configuredFrom = \config\Master::APPEARANCE['from-mail'] . "";
+        $configuredFrom = \config\Master::APPEARANCE['from-mail']."";
         $mail->From = $configuredFrom;
 // are we fancy? i.e. S/MIME signing?
         if (isset(\config\Master::MAILSETTINGS['certfilename'], \config\Master::MAILSETTINGS['keyfilename'], \config\Master::MAILSETTINGS['keypass'])) {
@@ -123,7 +123,7 @@ 
             $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no MX.");
             return OutsideComm::MAILDOMAIN_NO_MX;
         }
-        $loggerInstance->debug(5, "Domain: $domain MX: " . /** @scrutinizer ignore-type */ print_r($mx, TRUE));
+        $loggerInstance->debug(5, "Domain: $domain MX: "./** @scrutinizer ignore-type */ print_r($mx, TRUE));
         // create a pool of A and AAAA records for all the MXes
         $ipAddrs = [];
         foreach ($mx as $onemx) {
@@ -133,14 +133,14 @@ 
                 $ipAddrs[] = $oneipv4['ip'];
             }
             foreach ($v6list as $oneipv6) {
-                $ipAddrs[] = "[" . $oneipv6['ipv6'] . "]";
+                $ipAddrs[] = "[".$oneipv6['ipv6']."]";
             }
         }
         if (count($ipAddrs) == 0) {
             $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no mailserver hosts.");
             return OutsideComm::MAILDOMAIN_NO_HOST;
         }
-        $loggerInstance->debug(5, "Domain: $domain Addrs: " . /** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE));
+        $loggerInstance->debug(5, "Domain: $domain Addrs: "./** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE));
         // connect to all hosts. If all can't connect, return MAILDOMAIN_NO_CONNECT. 
         // If at least one does not support STARTTLS or one of the hosts doesn't connect
         // , return MAILDOMAIN_NO_STARTTLS (one which we can't connect to we also
@@ -193,7 +193,7 @@ 
         switch (\config\ConfAssistant::SMSSETTINGS['provider']) {
             case 'Nexmo':
                 // taken from https://docs.nexmo.com/messaging/sms-api
-                $url = 'https://rest.nexmo.com/sms/json?' . http_build_query(
+                $url = 'https://rest.nexmo.com/sms/json?'.http_build_query(
                                 [
                                     'api_key' => \config\ConfAssistant::SMSSETTINGS['username'],
                                     'api_secret' => \config\ConfAssistant::SMSSETTINGS['password'],
@@ -219,14 +219,14 @@ 
                     $loggerInstance->debug(2, 'Problem with SMS invitation: no message was sent!');
                     return OutsideComm::SMS_NOTSENT;
                 }
-                $loggerInstance->debug(2, 'Total of ' . $messageCount . ' messages were attempted to send.');
+                $loggerInstance->debug(2, 'Total of '.$messageCount.' messages were attempted to send.');
 
                 $totalFailures = 0;
                 foreach ($decoded_response['messages'] as $message) {
                     if ($message['status'] == 0) {
-                        $loggerInstance->debug(2, $message['message-id'] . ": Success");
+                        $loggerInstance->debug(2, $message['message-id'].": Success");
                     } else {
-                        $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")");
+                        $loggerInstance->debug(2, $message['message-id'].": Failed (failure code = ".$message['status'].")");
                         $totalFailures++;
                     }
                 }
@@ -295,7 +295,7 @@ 
             $proto = "https://";
         }
         // then, send out the mail
-        $message = _("Hello,") . "\n\n" . wordwrap($introTexts[$introtext] . " " . $validity, 72) . "\n\n";
+        $message = _("Hello,")."\n\n".wordwrap($introTexts[$introtext]." ".$validity, 72)."\n\n";
         // default means we don't have a Reply-To.
         $replyToMessage = wordwrap(_("manually. Please do not reply to this mail; this is a send-only address."));
 
@@ -303,8 +303,8 @@ 
             // see if we are supposed to add a custom message
             $customtext = $federation->getAttributes('fed:custominvite');
             if (count($customtext) > 0) {
-                $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72) . "\n---------------------------------" .
-                        wordwrap($customtext[0]['value'], 72) . "\n---------------------------------\n\n";
+                $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72)."\n---------------------------------".
+                        wordwrap($customtext[0]['value'], 72)."\n---------------------------------\n\n";
             }
             // and add Reply-To already now
             foreach ($federation->listFederationAdmins() as $fedadmin_id) {
@@ -320,19 +320,19 @@ 
         }
         $productname = \config\Master::APPEARANCE['productname'];
         $consortium = \config\ConfAssistant::CONSORTIUM['display_name'];
-        $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72) . "\n\n" .
-                $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/action_enrollment.php?token=$newtoken\n\n" .
-                wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72) . "\n\n" .
-                $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/\n\n" .
-                _("and enter the invitation token") . "\n\n" .
-                $newtoken . "\n\n$replyToMessage\n\n" .
-                wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "\n\n" .
-                wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72) . "\n\n" .
+        $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72)."\n\n".
+                $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/action_enrollment.php?token=$newtoken\n\n".
+                wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72)."\n\n".
+                $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/\n\n".
+                _("and enter the invitation token")."\n\n".
+                $newtoken."\n\n$replyToMessage\n\n".
+                wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72)."\n\n".
+                wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72)."\n\n".
                 sprintf(_("Sincerely,\n\nYour friendly folks from %s Operations"), $consortium);
 
 
 // who to whom?
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
 
         if (isset(\config\Master::APPEARANCE['invitation-bcc-mail']) && \config\Master::APPEARANCE['invitation-bcc-mail'] !== NULL) {
             $mail->addBCC(\config\Master::APPEARANCE['invitation-bcc-mail']);

core/common/Entity.php

Spacing +20 added lines, -20 removed lines

@@ -110,7 +110,7 @@ 
     public function __construct()
     {
         $this->loggerInstance = new Logging();
-        $this->loggerInstance->debug(3, "--- BEGIN constructing class " . get_class($this) . " .\n");
+        $this->loggerInstance->debug(3, "--- BEGIN constructing class ".get_class($this)." .\n");
         $this->languageInstance = new Language();
         Entity::intoThePotatoes("core");
         // some config elements are displayable. We need some dummies to 
@@ -129,13 +129,13 @@ 
         $dummy_organisation2a = _("organization");
         $dummy_organisation3 = _("entity");
         // and do something useless with the strings so that there's no "unused" complaint
-        if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3 . $dummy_hotspot1 . $dummy_hotspot2 . $dummy_hotspot3 . $dummy_organisation1 . $dummy_organisation2 . $dummy_organisation2a . $dummy_organisation3) < 0) {
+        if (strlen($dummy_NRO.$dummy_inst1.$dummy_inst2.$dummy_inst3.$dummy_hotspot1.$dummy_hotspot2.$dummy_hotspot3.$dummy_organisation1.$dummy_organisation2.$dummy_organisation2a.$dummy_organisation3) < 0) {
             throw new Exception("Strings are usually not shorter than 0 characters. We've encountered a string blackhole.");
         }
-        $xyzVariableFed = \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . "";
-        $xyzVariableInst = \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] . "";
-        $xyzVariableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot'] . "";
-        $xyzVariableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant'] . "";
+        $xyzVariableFed = \config\ConfAssistant::CONSORTIUM['nomenclature_federation']."";
+        $xyzVariableInst = \config\ConfAssistant::CONSORTIUM['nomenclature_institution']."";
+        $xyzVariableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot']."";
+        $xyzVariableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant']."";
         Entity::$nomenclature_fed = _($xyzVariableFed);
         Entity::$nomenclature_inst = _($xyzVariableInst);
         Entity::$nomenclature_hotspot = _($xyzVariableHotspot);
@@ -151,7 +151,7 @@ 
      */
     public function __destruct()
     {
-        (new Logging())->debug(5, "--- KILL Destructing class " . get_class($this) . " .\n");
+        (new Logging())->debug(5, "--- KILL Destructing class ".get_class($this)." .\n");
     }
 
     /**
@@ -184,7 +184,7 @@ 
     public static function createTemporaryDirectory($purpose = 'installer', $failIsFatal = 1)
     {
         $loggerInstance = new Logging();
-        $name = md5(time() . rand());
+        $name = md5(time().rand());
         $path = ROOT;
         switch ($purpose) {
             case 'silverbullet':
@@ -202,7 +202,7 @@ 
             default:
                 throw new Exception("unable to create temporary directory due to unknown purpose: $purpose\n");
         }
-        $tmpDir = $path . '/' . $name;
+        $tmpDir = $path.'/'.$name;
         $loggerInstance->debug(4, "temp dir: $purpose : $tmpDir\n");
         if (!mkdir($tmpDir, 0700, true)) {
             if ($failIsFatal) {
@@ -223,7 +223,7 @@ 
      */
     public static function rrmdir($dir)
     {
-        foreach (glob($dir . '/*') as $file) {
+        foreach (glob($dir.'/*') as $file) {
             if (is_dir($file)) {
                 Entity::rrmdir($file);
             } else {
@@ -249,12 +249,12 @@ 
         }
         // these substr() are guaranteed to yield actual string data, as the
         // base string is an MD5 hash - has sufficient length
-        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4) . '-';
+        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4).'-';
         $uuid .= /** @scrutinizer ignore-type */ substr($chars, 20, 12);
-        return $prefix . $uuid;
+        return $prefix.$uuid;
     }
 
     /**
@@ -295,7 +295,7 @@ 
         for ($i = count($trace); $i--; $i > 0) {
             if (isset($trace[$i - 1]['class']) && preg_match('/Entity/', $trace[$i - 1]['class'])) {
                 if ($showTrace) {
-                    echo "FOUND caller: " . /** @scrutinizer ignore-type */ print_r($trace[$i], true) . " - class is " . $trace[$i]['class'];
+                    echo "FOUND caller: "./** @scrutinizer ignore-type */ print_r($trace[$i], true)." - class is ".$trace[$i]['class'];
                 }
                 $caller = $trace[$i];
                 break;
@@ -305,8 +305,8 @@ 
         // otherwise, on the filename relative to ROOT
         $myName = $caller['class'] ?? substr($caller['file'], strlen(ROOT));
         if ($showTrace === TRUE) {
-            echo "<pre>" . /** @scrutinizer ignore-type */ print_r($trace, true) . "</pre>";
-            echo "CLASS = " . $myName . "<br/>";
+            echo "<pre>"./** @scrutinizer ignore-type */ print_r($trace, true)."</pre>";
+            echo "CLASS = ".$myName."<br/>";
         }
         if (preg_match("/diag/", $myName) == 1) {
             $ret = "diagnostics";
@@ -340,10 +340,10 @@ 
         if ($catalogue === NULL) {
             $theCatalogue = Entity::determineOwnCatalogue($trace);
             textdomain($theCatalogue);
-            bindtextdomain($theCatalogue, ROOT . "/translation/");
+            bindtextdomain($theCatalogue, ROOT."/translation/");
         } else {
             textdomain($catalogue);
-            bindtextdomain($catalogue, ROOT . "/translation/");
+            bindtextdomain($catalogue, ROOT."/translation/");
         }
     }