GEANT / CAT

devices/Devices-template.php

Spacing +11 added lines, -11 removed lines

@@ -404,7 +404,7 @@ 
                     'hs20' => 1,
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "geteduroam",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],            
             
@@ -418,7 +418,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "geteduroam",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],  
             'android_4_7' => [
@@ -431,7 +431,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],            
             
@@ -446,7 +446,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_pie' => [
@@ -460,7 +460,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_oreo' => [
@@ -474,7 +474,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_nougat' => [
@@ -488,7 +488,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_marshmallow' => [
@@ -502,7 +502,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_lollipop' => [
@@ -516,7 +516,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_kitkat' => [
@@ -530,7 +530,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_43' => [
@@ -544,7 +544,7 @@ 
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_legacy' => [

core/diag/RFC6614Tests.php

Spacing +8 added lines, -8 removed lines

@@ -166,27 +166,27 @@ 
     {
         // it could match CN or sAN:DNS, we don't care which
         if (isset($this->TLS_CA_checks_result[$host]['certdata']['subject'])) {
-            $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . " against Subject: ");
+            $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName." against Subject: ");
             $this->loggerInstance->debug(4, $this->TLS_CA_checks_result[$host]['certdata']['subject']);
             // we are checking against accidental misconfig, not attacks, so loosely checking against end of string is appropriate
-            if (preg_match("/CN=" . $this->expectedName . "/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) {
+            if (preg_match("/CN=".$this->expectedName."/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) {
                 return TRUE;
             }
         }
         if (isset($this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'])) {
-            $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . " against sANs: ");
+            $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName." against sANs: ");
             $this->loggerInstance->debug(4, $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname']);
             $testNames = $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'];
             if (!is_array($testNames)) {
                 $testNames = [$testNames];
             }
             foreach ($testNames as $oneName) {
-                if (preg_match("/" . $this->expectedName . "/", $oneName) === 1) {
+                if (preg_match("/".$this->expectedName."/", $oneName) === 1) {
                     return TRUE;
                 }
             }
         }
-        $this->loggerInstance->debug(3, "Tried to check expected server name " . $this->expectedName . " but neither CN nor sANs matched.");
+        $this->loggerInstance->debug(3, "Tried to check expected server name ".$this->expectedName." but neither CN nor sANs matched.");
 
         $this->TLS_CA_checks_result[$host]['cert_oddity'] = RADIUSTests::CERTPROB_DYN_SERVER_NAME_MISMATCH;
         return FALSE;
@@ -216,7 +216,7 @@ 
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['status'] = $cert['status'];
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['message'] = $this->TLS_certkeys[$cert['status']];
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['expected'] = $cert['expected'];
-                $add = ' -cert ' . ROOT . '/config/cli-certs/' . $cert['public'] . ' -key ' . ROOT . '/config/cli-certs/' . $cert['private'];
+                $add = ' -cert '.ROOT.'/config/cli-certs/'.$cert['public'].' -key '.ROOT.'/config/cli-certs/'.$cert['private'];
                 if (!isset($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k])) {
                     $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = [];
                 }
@@ -261,11 +261,11 @@ 
 // but code analysers want this more explicit, so here is this extra
 // call to escapeshellarg()
         $escapedHost = escapeshellarg($host);
-        $this->loggerInstance->debug(4, \config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -tls1 -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1\n");
+        $this->loggerInstance->debug(4, \config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -tls1 -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1\n");
         $time_start = microtime(true);
         $opensslbabble = [];
         $result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures
-        exec(\config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -no_ssl3 -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result);
+        exec(\config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -no_ssl3 -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result);
         $time_stop = microtime(true);
         $testresults['time_millisec'] = floor(($time_stop - $time_start) * 1000);
         $testresults['returncode'] = $result;

web/admin/edit_profile_result.php

Spacing +28 added lines, -28 removed lines

@@ -19,7 +19,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();
 $deco = new \web\lib\admin\PageDecoration();
@@ -43,7 +43,7 @@ 
         }
         $profileToBeDel = $validator->existingProfile($_GET['profile_id'], $my_inst->identifier);
         $profileToBeDel->destroy();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "Profile " . $profileToBeDel->identifier);
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "Profile ".$profileToBeDel->identifier);
         header("Location: overview_org.php?inst_id=$my_inst->identifier");
         exit;
     case web\lib\common\FormElements::BUTTON_SAVE:
@@ -52,7 +52,7 @@ 
             echo $deco->pageheader(sprintf(_("%s: Edit Profile - Result"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
         } else {
             $profile = $my_inst->newProfile(core\AbstractProfile::PROFILETYPE_RADIUS);
-            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $my_inst->identifier . " - Profile created");
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP ".$my_inst->identifier." - Profile created");
             echo $deco->pageheader(sprintf(_("%s: Profile wizard (step 3 completed)"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
         }
         if (!$profile instanceof \core\ProfileRADIUS) {
@@ -121,7 +121,7 @@ 
             $uiElements = new web\lib\admin\UIElements();
             // set realm info, if submitted
             if ($realm !== FALSE) {
-                $profile->setRealm($anonLocal . "@" . $realm);
+                $profile->setRealm($anonLocal."@".$realm);
                 echo $uiElements->boxOkay(sprintf(_("Realm: <strong>%s</strong>"), $realm));
             } else {
                 $profile->setRealm("");
@@ -147,7 +147,7 @@ 
                     echo $uiElements->boxError(_("Realm check username cannot be configured: realm is missing!"));
                 } else {
                     $profile->setRealmcheckUser(true, $checkuser_name);
-                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name . "@" . $realm));
+                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name."@".$realm));
                 }
             } else {
                 $profile->setRealmCheckUser(false);
@@ -159,12 +159,12 @@ 
                 $extratext = "";
                 if (!empty($realm)) {
                     if ($hint !== FALSE) {
-                        $extratext = " " . sprintf(_("The realm portion MUST be exactly '...@%s'."), $realm);
+                        $extratext = " ".sprintf(_("The realm portion MUST be exactly '...@%s'."), $realm);
                     } else {
-                        $extratext = " " . sprintf(_("The realm portion MUST end with '%s' but sub-realms of it are allowed (i.e. 'user@%s' and 'user@<...>.%s' are both acceptable)."), $realm, $realm, $realm);
+                        $extratext = " ".sprintf(_("The realm portion MUST end with '%s' but sub-realms of it are allowed (i.e. 'user@%s' and 'user@<...>.%s' are both acceptable)."), $realm, $realm, $realm);
                     }
                 }
-                echo $uiElements->boxOkay(_("Where possible, supplicants will verify that username inputs contain a syntactically correct realm.") . $extratext);
+                echo $uiElements->boxOkay(_("Where possible, supplicants will verify that username inputs contain a syntactically correct realm.").$extratext);
             } else {
                 $profile->setInputVerificationPreference(false, false);
             }
@@ -196,30 +196,30 @@ 
                 echo $uiElements->boxOkay(_("Redirection is <strong>OFF</strong>"));
             }
 
-            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - attributes changed");
+            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - attributes changed");
             // reload the profile to ingest new CA and server names if any; before checking EAP completeness
             $reloadedProfileNr1 = \core\ProfileFactory::instantiate($profile->identifier);
             foreach (\core\common\EAP::listKnownEAPTypes() as $a) {
                 if ($a->getIntegerRep() == \core\common\EAP::INTEGER_SILVERBULLET) { // do not allow adding silverbullet via the backdoor
                     continue;
                 }
-                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep() . "-priority"]) && is_numeric($_POST[$a->getPrintableRep() . "-priority"])) {
-                    $priority = (int) $_POST[$a->getPrintableRep() . "-priority"];
+                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep()."-priority"]) && is_numeric($_POST[$a->getPrintableRep()."-priority"])) {
+                    $priority = (int) $_POST[$a->getPrintableRep()."-priority"];
                     // add EAP type to profile as requested, but ...
                     $reloadedProfileNr1->addSupportedEapMethod($a, $priority);
-                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $reloadedProfileNr1->identifier . " - supported EAP types changed");
+                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$reloadedProfileNr1->identifier." - supported EAP types changed");
                     // see if we can enable the EAP type, or if info is missing
                     $eapcompleteness = $reloadedProfileNr1->isEapTypeDefinitionComplete($a);
                     if ($eapcompleteness === true) {
-                        echo $uiElements->boxOkay(_("Supported EAP Type: ") . "<strong>" . $a->getPrintableRep() . "</strong>");
+                        echo $uiElements->boxOkay(_("Supported EAP Type: ")."<strong>".$a->getPrintableRep()."</strong>");
                     } else {
                         $warntext = "";
                         if (is_array($eapcompleteness)) {
                             foreach ($eapcompleteness as $item) {
-                                $warntext .= "<strong>" . $uiElements->displayName($item) . "</strong> ";
+                                $warntext .= "<strong>".$uiElements->displayName($item)."</strong> ";
                             }
                         }
-                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext) . "<br/>" . _("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
+                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext)."<br/>"._("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
                     }
                 }
             }
@@ -230,23 +230,23 @@ 
             if (count($significantChanges) > 0) {
                 $myInstOriginal = new \core\IdP($profile->institution);
                 // send a notification/alert mail to someone we know is in charge
-                $text = _("To whom it may concern,") . "\n\n";
+                $text = _("To whom it may concern,")."\n\n";
                 /// were made to the *Identity Provider* *LU* / integer number of IdP / (previously known as) Name
-                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n";
+                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n";
                 if (isset($significantChanges[\core\AbstractProfile::CA_CLASH_ADDED])) {
-                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:") . "\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED] . "\n\n";
+                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:")."\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED]."\n\n";
                 }
                 if (isset($significantChanges[\core\AbstractProfile::CA_ADDED])) {
-                    $text .= _("A new trusted root CA was added. The details are below:") . "\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED] . "\n\n";
+                    $text .= _("A new trusted root CA was added. The details are below:")."\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED]."\n\n";
                 }
                 if (isset($significantChanges[\core\AbstractProfile::SERVERNAME_ADDED])) {
-                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:") . "\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED] . "\n\n";
+                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:")."\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED]."\n\n";
                 }
-                $text .= _("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";
-                $text .= _("Greetings, ") . "\n\n" . \config\Master::APPEARANCE['productname_long'];
+                $text .= _("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";
+                $text .= _("Greetings, ")."\n\n".\config\Master::APPEARANCE['productname_long'];
                 // (currently, send hard-wired to NRO - future: for linked insts, check eduroam DBv2 and send to registered admins directly)
                 $fed = new core\Federation($myInstOriginal->federation);
                 foreach ($fed->listFederationAdmins() as $id) {
@@ -303,14 +303,14 @@ 
                         $oneHostOkay = FALSE;
                         $testCandidates = [];
                         foreach ($dnsChecks->NAPTR_hostname_records as $oneServer) {
-                            $testCandidates[$oneServer['hostname']][] = ($oneServer['family'] == "IPv4" ? $oneServer['IP'] : "[" . $oneServer['IP'] . "]") . ":" . $oneServer['port'];
+                            $testCandidates[$oneServer['hostname']][] = ($oneServer['family'] == "IPv4" ? $oneServer['IP'] : "[".$oneServer['IP']."]").":".$oneServer['port'];
                         }
                         foreach ($testCandidates as $oneHost => $listOfIPs) {
                             $connectionTests = new core\diag\RFC6614Tests(array_values($listOfIPs), $oneHost, "openroaming");
                             // for now (no OpenRoaming client certs available) only run server-side tests
                             foreach ($listOfIPs as $oneIP) {
                                 $connectionResult = $connectionTests->cApathCheck($oneIP);
-                                if ($connectionResult != core\diag\AbstractTest::RETVAL_OK || ( isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) {
+                                if ($connectionResult != core\diag\AbstractTest::RETVAL_OK || (isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) {
                                     $allHostsOkay = FALSE;
                                 } else {
                                     $oneHostOkay = TRUE;
@@ -345,7 +345,7 @@ 
         <?php
         if (count($reloadedProfileNr2->getEapMethodsinOrderOfPreference(1)) > 0) {
             echo "<form method='post' action='overview_installers.php?inst_id=$my_inst->identifier&profile_id=$reloadedProfileNr2->identifier' accept-charset='UTF-8'>
-        <button type='submit'>" . _("Continue to Installer Fine-Tuning and Download") . "</button>
+        <button type='submit'>"._("Continue to Installer Fine-Tuning and Download")."</button>
     </form>";
         }
         echo $deco->footer();

web/skins/modern/index.php

Spacing +4 added lines, -4 removed lines

@@ -44,8 +44,8 @@ 
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '".$operatingSystem['device'] . "';\n";
-    print "recognisedOShs20 = '".$operatingSystem['hs20'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
+    print "recognisedOShs20 = '".$operatingSystem['hs20']."';\n";
     $vendorlogo = $Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/");
     if ($vendorlogo !== FALSE) {
         print "vendorlogo = '$vendorlogo';\n";
@@ -54,7 +54,7 @@ 
     }
 }
 
-print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
 if (preg_match('/Android/', $userAgent)) {
@@ -83,7 +83,7 @@ 
     <?php echo $divs->divHeading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>

web/admin/overview_federation.php

Spacing +35 added lines, -35 removed lines

@@ -19,7 +19,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";
 
 $deco = new \web\lib\admin\PageDecoration();
 $uiElements = new web\lib\admin\UIElements();
@@ -50,16 +50,16 @@ 
     <div class="infobox">
         <h2><?php $tablecaption = _("Your Personal Information"); echo $tablecaption; ?></h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>            
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
             <tr>
                 <td>
-                    <?php echo "" . _("Unique Identifier") ?>
+                    <?php echo ""._("Unique Identifier") ?>
                 </td>
                 <td>
                 </td>
@@ -74,7 +74,7 @@ 
     $mgmt = new \core\UserManagement();
 
     if (!$user->isFederationAdmin()) {
-        echo "<p>" . sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed) . "</p>";
+        echo "<p>".sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed)."</p>";
         echo $deco->footer();
         exit(0);
     }
@@ -88,16 +88,16 @@ 
                 <?php $tablecaption2 = sprintf(_("%s Properties: %s"), $uiElements->nomenclatureFed, $thefed->name); echo $tablecaption2; ?>
             </h2>
             <table>
-            <caption><?php echo $tablecaption2;?></caption>
+            <caption><?php echo $tablecaption2; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
                 <!-- fed properties -->
                 <tr>
                     <td>
-                        <?php echo "" . _("Country") ?>
+                        <?php echo ""._("Country") ?>
                     </td>
                     <td>
                     </td>
@@ -178,7 +178,7 @@ 
                     default:
                         throw new Exception("Error: unknown encryption status of invitation!?!");
                 }
-                echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter) . " " . $cryptText, _("Sent successfully."));
+                echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter)." ".$cryptText, _("Sent successfully."));
                 break;
             case "FAILURE":
                 echo $uiElements->boxError(_("No invitation email could be sent!"), _("Sending failure!"));
@@ -198,7 +198,7 @@ 
                     default:
                         throw new Exception("Error: unknown encryption status of invitation!?!");
                 }
-                echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter) . " " . $cryptText, _("Partial success."));
+                echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter)." ".$cryptText, _("Partial success."));
                 break;
             case "INVALIDSYNTAX":
                 echo $uiElements->boxError(_("The invitation email address was malformed, no invitation was sent!"), _("The invitation email address was malformed, no invitation was sent!"));
@@ -214,27 +214,27 @@ 
     } else {
         $link = 'http://';
     }
-    $link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'];
+    $link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
     $link = htmlspecialchars($link);
     if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL' && \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
         echo "<table><tr>
-                        <td>" . sprintf(_("Diagnose reachability and connection parameters of any %s %s"), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst) . "</td>
+                        <td>" . sprintf(_("Diagnose reachability and connection parameters of any %s %s"), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst)."</td>
                         <td><form method='post' action='../diag/action_realmcheck.php' accept-charset='UTF-8'>
                               <input type='hidden' name='comefrom' id='comefrom' value='$link'/>
-                              <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button>
                             </form>
                         </td>
                     </tr>
                     </table>";
     }
     if (\config\ConfAssistant::CONSORTIUM['name'] == 'eduroam') {
-        $helptext = "<h3>" . sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed) . "</h3>";
+        $helptext = "<h3>".sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed)."</h3>";
     } else {
         $helptext = "";
     }
     ?>
     <table class='user_overview' style='border:0px;'>
-        <caption><?php echo _("Participant Details");?></caption>
+        <caption><?php echo _("Participant Details"); ?></caption>
         <tr>
             <th scope='col'><?php echo _("Configured / Visible / OpenRoaming"); ?></th>
             <th scope='col'><?php echo sprintf(_("%s Name"), $uiElements->nomenclatureInst); ?></th>
@@ -243,7 +243,7 @@ 
             $pending_invites = $mgmt->listPendingInvitations();
 
             if (\config\Master::DB['enforce-external-sync']) {
-                echo "<th scope='col'>" . sprintf(_("%s Database Sync Status"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</th>";
+                echo "<th scope='col'>".sprintf(_("%s Database Sync Status"), \config\ConfAssistant::CONSORTIUM['display_name'])."</th>";
             }
             ?>
             <th scope='col'>
@@ -258,7 +258,7 @@ 
         foreach ($feds as $onefed) {
             $thefed = new \core\Federation(strtoupper($onefed['value']));
             /// nomenclature for 'federation', federation name, nomenclature for 'inst'
-            echo "<tr><td colspan='8'><strong>" . sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, '<span style="color:green">' . $thefed->name . '</span>') . "</strong></td></tr>";
+            echo "<tr><td colspan='8'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>";
 
             // extract only pending invitations for *this* fed
             $display_pendings = FALSE;
@@ -283,9 +283,9 @@ 
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime                    
                 echo "<td>";
-                echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "-" ) 
+                echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "-") 
                         . " " 
-                        . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "-" )
+                        . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "-")
                         . " "
                         . "<span style='color:";
                 switch ($idp_instance->maxOpenRoamingStatus()) {
@@ -320,23 +320,23 @@ 
                     }
                 }
                 echo "<td style='vertical-align:top;'>
-                         <input type='hidden' name='inst' value='" . $index . "'>" . $idp_instance->name . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) . implode("</li><li>", $listOfSilverbulletRealms) . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" ) . "
+                         <input type='hidden' name='inst' value='" . $index."'>".$idp_instance->name.(empty($listOfSilverbulletRealms) ? "" : "<ul><li>").implode("</li><li>", $listOfSilverbulletRealms).(empty($listOfSilverbulletRealms) ? "" : "</li><ul>")."
                       </td>";
                 // external DB sync, if configured as being necessary
                 if (\config\Master::DB['enforce-external-sync']) {
                     echo "<td style='display: ruby;'>";
                     if ($readonly === FALSE) {
-                        echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=" . $idp_instance->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
-                                    <button type='submit'>" . _("Manage DB Link") . "</button></form>&nbsp;&nbsp;";
+                        echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=".$idp_instance->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
+                                    <button type='submit'>" . _("Manage DB Link")."</button></form>&nbsp;&nbsp;";
                     }
                     switch ($idp_instance->getExternalDBSyncState()) {
                         case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOTSUBJECTTOSYNCING:
                             break;
                         case \core\IdP::EXTERNAL_DB_SYNCSTATE_SYNCED:
-                            echo "<div class='acceptable'>" . _("Linked") . "</div>";
+                            echo "<div class='acceptable'>"._("Linked")."</div>";
                             break;
                         case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOT_SYNCED:
-                            echo "<div class='notacceptable'>" . _("NOT linked") . "</div>";
+                            echo "<div class='notacceptable'>"._("NOT linked")."</div>";
 
 
                             break;
@@ -349,9 +349,9 @@ 
                 echo "<td style='vertical-align: top;'>";
                 if ($readonly === FALSE) {
                     echo "<div style='white-space: nowrap;'>
-                                  <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
+                                  <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                                       <button type='submit'>" .
-                    _("Add/Remove Administrators") . "
+                    _("Add/Remove Administrators")."
                                       </button>
                                   </form>
                                 </div>";
@@ -364,7 +364,7 @@ 
                 echo "<tr>
                             <td colspan='2'>
                                <strong>" .
-                sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed) . "
+                sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed)."
                                </strong>
                             </td>
                          </tr>";
@@ -372,16 +372,16 @@ 
                     if (strtoupper($oneinvite['country']) == strtoupper($thefed->tld)) {
                         echo "<tr>
                                     <td>" .
-                        $oneinvite['name'] . "
+                        $oneinvite['name']."
                                     </td>
                                     <td>" .
-                        $oneinvite['mail'] . "
+                        $oneinvite['mail']."
                                     </td>
                                     <td colspan=2>";
                         if ($readonly === FALSE) {
                             echo "<form method='post' action='overview_federation.php' accept-charset='UTF-8'>
-                                <input type='hidden' name='invitation_id' value='" . $oneinvite['token'] . "'/>
-                                <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Revoke Invitation") . "</button> "
+                                <input type='hidden' name='invitation_id' value='" . $oneinvite['token']."'/>
+                                <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE."'>"._("Revoke Invitation")."</button> "
                             . sprintf(_("(expires %s)"), $oneinvite['expiry'])
                             . "</form>";
                         }

core/IdP.php

Spacing +13 added lines, -13 removed lines

@@ -115,12 +115,12 @@ 
         $this->name = $this->languageInstance->getLocalisedValue($this->getAttributes('general:instname'));
         $eligibility = $this->eligibility();
         if (in_array(IdP::ELIGIBILITY_IDP, $eligibility) && in_array(IdP::ELIGIBILITY_SP, $eligibility)) {
-            $eligType = IdP::TYPE_IDPSP . "";
+            $eligType = IdP::TYPE_IDPSP."";
             $this->type = $eligType;
         } elseif (in_array(IdP::ELIGIBILITY_IDP, $eligibility)) {
-            $eligType = IdP::TYPE_IDP . "";
+            $eligType = IdP::TYPE_IDP."";
         } else {
-            $eligType = IdP::TYPE_SP . "";
+            $eligType = IdP::TYPE_SP."";
         }
         $this->type = $eligType;
         $this->loggerInstance->debug(3, "--- END Constructing new IdP object ... ---\n");
@@ -134,7 +134,7 @@ 
      */
     public function listProfiles(bool $activeOnly = FALSE)
     {
-        $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier" . ($activeOnly ? " AND showtime = 1" : "");
+        $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier".($activeOnly ? " AND showtime = 1" : "");
         $allProfiles = $this->databaseHandle->exec($query);
         $returnarray = [];
         // SELECT -> resource, not boolean
@@ -144,7 +144,7 @@ 
             $returnarray[] = $oneProfile;
         }
 
-        $this->loggerInstance->debug(4, "listProfiles: " . /** @scrutinizer ignore-type */ print_r($returnarray, true));
+        $this->loggerInstance->debug(4, "listProfiles: "./** @scrutinizer ignore-type */ print_r($returnarray, true));
         return $returnarray;
     }
 
@@ -156,7 +156,7 @@ 
      */
     public function listDeployments(bool $activeOnly = FALSE)
     {
-        $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier" . ($activeOnly ? " AND status = " . AbstractDeployment::ACTIVE : "");
+        $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier".($activeOnly ? " AND status = ".AbstractDeployment::ACTIVE : "");
         $allDeployments = $this->databaseHandle->exec($query);
         $returnarray = [];
         // SELECT -> resource, not boolean
@@ -164,7 +164,7 @@ 
             $returnarray[] = new DeploymentManaged($this, $deploymentQuery->deployment_id);
         }
 
-        $this->loggerInstance->debug(4, "listDeployments: " . /** @scrutinizer ignore-type */ print_r($returnarray, true));
+        $this->loggerInstance->debug(4, "listDeployments: "./** @scrutinizer ignore-type */ print_r($returnarray, true));
         return $returnarray;
     }
 
@@ -197,7 +197,7 @@ 
         $allProfiles = $this->databaseHandle->exec("SELECT MIN(openroaming) AS maxlevel FROM profile WHERE inst_id = $this->identifier");
         // SELECT yields a resource, not a boolean
         while ($res = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allProfiles)) {
-            return (is_numeric($res->maxlevel) ? (int)$res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO ); // insts without profiles should get a "NO"
+            return (is_numeric($res->maxlevel) ? (int) $res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO); // insts without profiles should get a "NO"
         }
         return AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO;
     }
@@ -331,7 +331,7 @@ 
                 case AbstractProfile::PROFILETYPE_SILVERBULLET:
                     $theProfile = new ProfileSilverbullet($identifier, $this);
                     $theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1);
-                    $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix']));
+                    $theProfile->setRealm($this->identifier."-".$theProfile->identifier.".".strtolower($this->federation).strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix']));
                     return $theProfile;
                 default:
                     throw new Exception("This type of profile is unknown and can not be added.");
@@ -473,7 +473,7 @@ 
     public function getExternalDBId()
     {
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
-            $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = " . self::EXTERNAL_DB_SYNCSTATE_SYNCED);
+            $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = ".self::EXTERNAL_DB_SYNCSTATE_SYNCED);
             // SELECT -> it's a resource, not a boolean
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $idQuery) == 0) {
                 return FALSE;
@@ -539,16 +539,16 @@ 
         }
         foreach ($baseline as $lang => $value) {
             if (!key_exists($lang, $newvalues)) {
-                $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] DELETED";
+                $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] DELETED";
             } else {
                 if ($value != $newvalues[$lang]) {
-                    $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] CHANGED from '" . $baseline[$lang] . "' to '" . $newvalues[$lang] . "'";
+                    $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] CHANGED from '".$baseline[$lang]."' to '".$newvalues[$lang]."'";
                 }
             }
         }
         foreach ($newvalues as $lang => $value) {
             if (!key_exists($lang, $baseline)) {
-                $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] ADDED as '" . $value . "'";
+                $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] ADDED as '".$value."'";
             }
         }
         return $retval;

devices/chromebook/DeviceChromebook.php

Spacing +10 added lines, -10 removed lines

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

devices/apple_mobileconfig/MobileconfigSuperclass.php

Indentation +2 added lines, -2 removed lines

@@ -522,7 +522,7 @@ 
         if (
                 get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigIos12plus" || 
                 get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigOsX"
-           ) {
+            ) {
                     return "WPA2";
                 } else {
                     return "WPA";
@@ -809,7 +809,7 @@ 
                             \core\common\Entity::$nomenclature_inst, 
                             count($this->CAsAccountedFor)+1, 
                             ($ca['root'] ? _("Root") : _("Intermediate"))) . 
-              "</string>
+                "</string>
                <key>PayloadIdentifier</key>
                <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
                <key>PayloadOrganization</key>

Spacing +51 added lines, -51 removed lines

@@ -145,7 +145,7 @@ 
         \core\common\Entity::intoThePotatoes();
         // that's what all variants support. Sub-classes can change it.
         $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_PEAP_MSCHAP2, \core\common\EAP::EAPTYPE_TTLS_PAP, \core\common\EAP::EAPTYPE_TTLS_MSCHAP2, \core\common\EAP::EAPTYPE_SILVERBULLET]);
-        foreach(\core\common\EAP::listKnownEAPTypes() as $eapType) {
+        foreach (\core\common\EAP::listKnownEAPTypes() as $eapType) {
             if ($eapType->isPasswordRequired() || $eapType->isPasswordOptional()) {
                 $this->specialities['internal:verify_userinput_suffix'][serialize($eapType->getArrayRep())] = _("It is not possible to actively verify the user input for suffix match; but if there is no 'Terms of Use' configured, the installer will display a corresponding hint to the user instead.");
                 $this->specialities['media:openroaming'][serialize($eapType->getArrayRep())] = _("OpenRoaming is not provisioned due to severe UI limitations during install time.");
@@ -185,15 +185,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();
@@ -225,21 +225,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;
             }
@@ -263,7 +263,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");
@@ -305,7 +305,7 @@ 
 
         file_put_contents('installer_profile', $outputXml);
 
-        $fileName = $this->installerBasename . '.mobileconfig';
+        $fileName = $this->installerBasename.'.mobileconfig';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -313,7 +313,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");
         }
@@ -332,19 +332,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>";
@@ -384,7 +384,7 @@ 
                <key>ServiceProviderRoamingEnabled</key>
                <true/>
                <key>DisplayedOperatorName</key>
-               <string>" . $oiName . "</string>";
+               <string>" . $oiName."</string>";
         // if we don't know the realm, omit the entire DomainName key
         if (isset($this->attributes['internal:realm'])) {
             $retval .= "<key>DomainName</key>
@@ -397,7 +397,7 @@ 
                 <array>";
 
         foreach ($consortiumOi as $oneCons) {
-            $retval .= "<string>" . strtoupper($oneCons) . "</string>";
+            $retval .= "<string>".strtoupper($oneCons)."</string>";
         }
 
         $retval .= "</array>";
@@ -435,7 +435,7 @@ 
                   <dict>
                       <key>AcceptEAPTypes</key>
                          <array>
-                            <integer>" . $eapType['OUTER'] . "</integer>
+                            <integer>" . $eapType['OUTER']."</integer>
                          </array>
                       <key>EAPFASTProvisionPAC</key>
                             <true />
@@ -448,7 +448,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>
@@ -472,11 +472,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;
     }
@@ -496,9 +496,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 {
@@ -548,7 +548,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(_("%s - SSID %s"), $prettyName, $escapedSSID);
                 $payloadName = sprintf(_("%s configuration for network name %s"), $prettyName, $escapedSSID);
                 $encryptionTypeString = $this->encryptionString();
@@ -578,9 +578,9 @@ 
                 if (count($toBeConfigured) == 0) {
                     return "";
                 }
-                $payloadIdentifier = "hs20.".implode('-',$toBeConfigured);
+                $payloadIdentifier = "hs20.".implode('-', $toBeConfigured);
                 $payloadShortName = sprintf(_("%s - RCOI"), $prettyName);
-                $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"),$prettyName);
+                $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"), $prettyName);
                 $encryptionTypeString = $this->encryptionString();
                 $setupModesString = "";
                 $wifiNetworkIdentification = $this->passPointBlock($toBeConfigured, $prettyName);
@@ -599,11 +599,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) {
@@ -615,7 +615,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>";
@@ -645,15 +645,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();
@@ -733,12 +733,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
@@ -746,7 +746,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>
@@ -756,7 +756,7 @@ 
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
         \core\common\Entity::outOfThePotatoes();
         return $retArray;
     }
@@ -774,7 +774,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>";
     }
 
     /**
@@ -796,27 +796,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/user/TextTemplates.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,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;
 
 
 /**
@@ -103,13 +103,13 @@ 
         ];
         $this->templates[WELCOME_ABOARD_TERMS] = "";
         foreach ($this->templates[NETWORK_TERMS_AND_PRIV] as $consortium => $terms) {
-            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("Please remember that 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_LINK'], $terms['PRIV_LINK']);
+            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>"._("Please remember that 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_LINK'], $terms['PRIV_LINK']);
         }
     //    $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']);