GEANT / CAT

web/admin/edit_participant.php

Spacing +30 added lines, -30 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();
@@ -114,12 +114,12 @@ 
         </table>
     </div>
     <?php
-    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier" . ($wizardStyle ? "&wizard=true" : "") . "' method='post' accept-charset='UTF-8'>
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier".($wizardStyle ? "&wizard=true" : "")."' method='post' accept-charset='UTF-8'>
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
 
     if ($wizardStyle) {
-        echo "<p>" .
-        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant) . "</p>";
+        echo "<p>".
+        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant)."</p>";
     }
     $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, \core\Options::LEVEL_IDP);
     ?>
@@ -127,11 +127,11 @@ 
         <legend><strong><?php echo _("General Information"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" .
-            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:") . "</p>
+            echo "<p>".
+            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:")."</p>
                       <ul>
-                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).") . "</li>
-                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $uiElements->nomenclatureParticipant) . "</li>";
+                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).")."</li>
+                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $uiElements->nomenclatureParticipant)."</li>";
             echo "</ul>";
         }
         echo $optionDisplay->prefilledOptionTable("general", $my_inst->federation);
@@ -146,44 +146,44 @@ 
             <legend><strong><?php echo _("Media Properties"); ?></strong></legend>
             <?php
             if ($wizardStyle) {
-                echo "<p>" .
-                sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>
+                echo "<p>".
+                sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>
           <ul>";
                 echo "<li>";
-                echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+                echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>";
                 if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
                     $ssidlist = "";
                     foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) {
-                        $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+                        $ssidlist .= ", '<strong>".$ssid."</strong>'";
                     }
                     $ssidlist = substr($ssidlist, 2);
                     echo sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist);
-                    echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
+                    echo "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
                 } else {
                     echo _("Please configure which SSIDs should be configured in the installers.");
                 }
-                echo " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
+                echo " "._("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
                 echo "</li>";
 
                 echo "<li>";
-                echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+                echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>";
                 if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) {
                     $consortiumlist = "";
                     foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) {
-                        $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+                        $consortiumlist .= ", '<strong>".$oi."</strong>'";
                     }
                     $consortiumlist = substr($consortiumlist, 2);
                     echo sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'])), $consortiumlist);
 
-                    echo "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
+                    echo "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
                 } else {
                     echo _("Please configure which Consortium OIs should be configured in the installers.");
                 }
                 echo "</li>";
-                echo "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>"
-                . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") .
+                echo "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>"
+                . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).").
                 "</li>";
-                echo "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
+                echo "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>"
                 . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.")
                 . "</li>";
                 echo "</ul>";
@@ -199,18 +199,18 @@ 
         <legend><strong><?php echo _("Helpdesk Details for all users"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" . _("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.") . "</p>";
+            echo "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>";
 
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<p>" .
-                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $uiElements->nomenclatureParticipant) . "</p>" .
-                "<p>" .
-                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.") . "</p>";
+                echo "<p>".
+                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $uiElements->nomenclatureParticipant)."</p>".
+                "<p>".
+                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.")."</p>";
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                    echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), config\ConfAssistant::SILVERBULLET['product_name']) . " " . _("This is the contact point for your organisation. It may be displayed publicly.") . "</p>";
+                    echo "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), config\ConfAssistant::SILVERBULLET['product_name'])." "._("This is the contact point for your organisation. It may be displayed publicly.")."</p>";
                 }
             } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>" . _("Providing at least a local support e-mail contact is required.") . " " . _("This is the contact point for your end users' level 1 support.") . "</p>";
+                echo "<p>"._("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
             }
         }
         echo $optionDisplay->prefilledOptionTable("support", $fed->tld);
@@ -225,9 +225,9 @@ 
         $discardLabel = _("Discard changes");
     }
     if ($wizardStyle) {
-        echo "<p>" . sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CONTINUE . "'>", "</button>") . "</p></form>";
+        echo "<p>".sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CONTINUE."'>", "</button>")."</p></form>";
     } else {
-        echo "<div><button type='submit' id='submitbutton' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button> <button type='button' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>".$discardLabel."</button></div></form>";
+        echo "<div><button type='submit' id='submitbutton' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button> <button type='button' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>".$discardLabel."</button></div></form>";
     }
     echo $deco->footer();
     
\ No newline at end of file

config/Master-template.php

Indentation +2 added lines, -3 removed lines

@@ -150,7 +150,6 @@ 
          *    mails, just configure the signing cert with these parameters. All must
          *    be non-NULL for signing to happen. If you don't need a keypass, make 
          *    it an empty string instead.
-
          * @var array
          */
         const MAILSETTINGS = [// we always use Submission
@@ -163,8 +162,8 @@ 
             'keyfilename' => NULL,
             'keypass' => NULL,
             'notify_nro' => false, // normally should be set to TRUE abd causes 
-                                   // notifications being sent to NRO admins when
-                                   // important changes are made
+                                    // notifications being sent to NRO admins when
+                                    // important changes are made
         ];
         /**
          * List of all supported languages in CAT. Comment some if you want to disable them

Spacing +7 added lines, -7 removed lines

@@ -174,7 +174,7 @@ 
             'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE, 'rtl' => FALSE],
             'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
             'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
-            'cy' => ['display' => 'Cymraeg',     'locale' => 'cy_GB.utf8',    'latin_based' => TRUE, 'rtl' => FALSE],
+            'cy' => ['display' => 'Cymraeg', 'locale' => 'cy_GB.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
             'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
             'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE, 'rtl' => FALSE],
             'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
@@ -221,7 +221,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             // this DB stores diagnostics data. The connection details can be
             // identical to INST as there is no table overlap
             'DIAGNOSTICS' => [
@@ -229,7 +229,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             // this slice of DB user is about the downloads table. The corresponding
             // DB user should have write access to update statistics and the cache
             // locations of installers. 
@@ -239,7 +239,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             // this slice of DB use is about user management in the user_options
             // table. Giving the corresponding user only read-only access means that
             // all user properties have to "magically" occur in the table by OOB
@@ -250,7 +250,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             /*   If you use this tool in conjunction with an external customer management database, you can configure that every 
              * institution entry in CAT MUST correspond to a customer entry in an external database. If you want this, set this
              * config variable to TRUE.
@@ -276,7 +276,7 @@ 
                 'db' => 'customer_db',
                 'user' => 'customerservice',
                 'pass' => '2lame4u',
-                'readonly' => TRUE,],
+                'readonly' => TRUE, ],
             /*
              * EXTERNAL_SOURCE is the source only used in the caching script, if you
              * do not use local caching then these settings are irrelevant
@@ -286,7 +286,7 @@ 
                 'db' => 'customer_db',
                 'user' => 'customerservice',
                 'pass' => '2lame4u',
-                'readonly' => TRUE,],
+                'readonly' => TRUE, ],
             
             'enforce-external-sync' => TRUE,
         ];

web/admin/edit_participant_result.php

Spacing +22 added lines, -22 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->nomenclatureParticipant, 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->nomenclatureParticipant, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n".
                 $bye;
         $fed = new core\Federation($myInstOriginal->federation);
         if (\config\Master::MAILSETTINGS['notify_nro']) {
@@ -74,19 +74,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']);
@@ -95,10 +95,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->nomenclatureParticipant, 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->nomenclatureParticipant, 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->nomenclatureParticipant) . "\n\n";
-                $text .= $significantChanges[\core\IdP::INSTNAME_CHANGED] . "\n\n";
+                $text .= sprintf(_("The %s has changed its name. The details are below:"), $ui->nomenclatureParticipant)."\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)
@@ -116,12 +116,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>";
@@ -129,7 +129,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"));
         }
@@ -150,7 +150,7 @@ 
         $myfed = new \core\Federation($myInstReinstantiated->federation);
         $allow_sb = $myfed->getAttributes("fed:silverbullet");
         // only show IdP parts if fed has enabled hosted services && participant is an SP-type
-        if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" && count($allow_sb) > 0 && preg_match("/IdP/", $myInstReinstantiated->type) ) {
+        if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" && count($allow_sb) > 0 && preg_match("/IdP/", $myInstReinstantiated->type)) {
 // show the new profile jumpstart buttons only if we do not have any profile at all
             if (count($myInstReinstantiated->listProfiles()) == 0) {
 
@@ -158,7 +158,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=$instId' 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=$instId' 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->nomenclatureParticipant), _("No support e-mail!"));
@@ -166,11 +166,11 @@ 
                 }
 
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                    echo "<br/><form method='post' action='edit_profile.php?inst_id=$instId' 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=$instId' accept-charset='UTF-8'><button type='submit'>"._("Continue to RADIUS/EAP profile definition")."</button></form>";
                 }
             }
         }
-        echo "<br/><form method='post' action='overview_org.php?inst_id=$instId' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+        echo "<br/><form method='post' action='overview_org.php?inst_id=$instId' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
 
         break;
     default:

web/lib/admin/OptionParser.php

Spacing +10 added lines, -10 removed lines

@@ -93,7 +93,7 @@ 
                     if ($cert['full_details']['type'] == 'server') {
                         $reason = _("%s - server certificate (<a href='%s'>more info</a>)");
                         $fail = true;
-                    } elseif($cert['basicconstraints_set'] === 0) {
+                    } elseif ($cert['basicconstraints_set'] === 0) {
                         $reason = _("%s - missing required CA extensions (<a href='%s'>more info</a>)");
                         $fail = true;
                     }    
@@ -122,7 +122,7 @@ 
                 $optionClass = \core\Options::instance();
                 $optionProps = $optionClass->optionType($optiontype);
                 $allowedValues = explode(',', substr($optionProps["flags"], 7));
-                if (in_array($incomingBinary,$allowedValues))  {
+                if (in_array($incomingBinary, $allowedValues)) {
                     return ['result'=>TRUE, 'details'=>''];
                 }
                 return ['result'=>FALSE, 'details'=>''];
@@ -368,14 +368,14 @@ 
                 case \core\Options::TYPECODE_TEXT:
                 case \core\Options::TYPECODE_COORDINATES:
                 case \core\Options::TYPECODE_INTEGER:
-                    $varName = $listOfEntries["$objId-" . self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
+                    $varName = $listOfEntries["$objId-".self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
                     if (!empty($varName)) {
                         $content = call_user_func_array([$this->validator, self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['function']], array_merge([$varName], self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['extraarg']));
                         break;
                     }
                     continue 2;
                 case \core\Options::TYPECODE_BOOLEAN:
-                    $varName = $listOfEntries["$objId-" . \core\Options::TYPECODE_BOOLEAN];
+                    $varName = $listOfEntries["$objId-".\core\Options::TYPECODE_BOOLEAN];
                     if (!empty($varName)) {
                         $contentValid = $this->validator->boolean($varName);
                         if ($contentValid) {
@@ -388,7 +388,7 @@ 
                     }
                     continue 2;
                 case \core\Options::TYPECODE_STRING:
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
                     if (!empty(trim($previsionalContent))) {
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
                         if ($content === FALSE) {
@@ -399,7 +399,7 @@ 
                     continue 2;
                     
                 case \core\Options::TYPECODE_ENUM_OPENROAMING:
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_ENUM_OPENROAMING];
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_ENUM_OPENROAMING];
                     if (!empty($previsionalContent)) {
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
                         if ($content === FALSE) {
@@ -410,15 +410,15 @@ 
                     continue 2;    
                 case \core\Options::TYPECODE_FILE:
                     // this is either actually an uploaded file, or a reference to a DB entry of a previously uploaded file
-                    $reference = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
+                    $reference = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
                     if (!empty($reference)) { // was already in, by ROWID reference, extract
                         // ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
                         $content = $this->validator->string(urldecode($reference), TRUE);
                         break;
                     }
-                    $fileName = $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] ?? "";
+                    $fileName = $listOfEntries["$objId-".\core\Options::TYPECODE_FILE] ?? "";
                     if ($fileName != "") { // let's do the download
-                        $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $fileName);
+                        $rawContent = \core\common\OutsideComm::downloadFile("file:///".$fileName);
                         $sanity = $this->checkUploadSanity($objValue, $rawContent);
                         if ($rawContent === FALSE || !$sanity['result']) {
                             $bad[] = ['type'=>$objValue, 'details'=>$sanity['details']];
@@ -429,7 +429,7 @@ 
                     }
                     continue 2;
                 default:
-                    throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
+                    throw new Exception("Internal Error: Unknown option type ".$objValue."!");
             }
             // lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
             $retval[] = ["$objValue" => ["lang" => $languageFlag, "content" => $content]];

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(4, "--- BEGIN constructing class " . get_class($this) . " .\n");
+        $this->loggerInstance->debug(4, "--- 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_idp1 . $dummy_idp2 . $dummy_idp3 . $dummy_hotspot1 . $dummy_hotspot2 . $dummy_hotspot3 . $dummy_organisation1 . $dummy_organisation2 . $dummy_organisation2a . $dummy_organisation3) < 0) {
+        if (strlen($dummy_NRO.$dummy_idp1.$dummy_idp2.$dummy_idp3.$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'] . "";
-        $xyzVariableIdP = \config\ConfAssistant::CONSORTIUM['nomenclature_idp'] . "";
-        $xyzVariableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot'] . "";
-        $xyzVariableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant'] . "";
+        $xyzVariableFed = \config\ConfAssistant::CONSORTIUM['nomenclature_federation']."";
+        $xyzVariableIdP = \config\ConfAssistant::CONSORTIUM['nomenclature_idp']."";
+        $xyzVariableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot']."";
+        $xyzVariableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant']."";
         Entity::$nomenclature_fed = _($xyzVariableFed);
         Entity::$nomenclature_idp = _($xyzVariableIdP);
         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,11 +340,11 @@ 
         if ($catalogue === NULL) {
             $theCatalogue = Entity::determineOwnCatalogue($trace);
             textdomain($theCatalogue);
-            bindtextdomain($theCatalogue, ROOT . "/translation/");
+            bindtextdomain($theCatalogue, ROOT."/translation/");
             bind_textdomain_codeset($theCatalogue, "UTF-8");
         } else {
             textdomain($catalogue);
-            bindtextdomain($catalogue, ROOT . "/translation/");
+            bindtextdomain($catalogue, ROOT."/translation/");
             bind_textdomain_codeset($catalogue, "UTF-8");
         }
     }

core/ProfileRADIUS.php

Spacing +10 added lines, -10 removed lines

@@ -105,9 +105,9 @@ 
 
         $attributesLowLevel = array_merge($this->deviceLevelAttributes, $this->eapLevelAttributes);
 
-        $this->loggerInstance->debug(5, "Device-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
-        $this->loggerInstance->debug(5, "EAP-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
-        $this->loggerInstance->debug(5, "All low-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Device-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
+        $this->loggerInstance->debug(5, "EAP-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
+        $this->loggerInstance->debug(5, "All low-Level Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now fetch and merge profile-level attributes if not already set on deeper level
 
@@ -137,7 +137,7 @@ 
             }
         }
 
-        $this->loggerInstance->debug(5, "Merged Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Merged Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now, fetch and merge IdP-wide attributes
 
@@ -152,7 +152,7 @@ 
         // add the internal attribute to that effect
         
         if (isset($this->attributes['media:openroaming_always'])) {
-            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes([ "internal:openroaming" => TRUE ] ));
+            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes(["internal:openroaming" => TRUE]));
         }
         
         $this->loggerInstance->debug(4, "--- END Constructing new Profile object ... ---\n");
@@ -200,7 +200,7 @@ 
                 "row_id" => $attributeQuery->row_id,
                 "flag" => $optinfo['flag'],
                 "device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
-                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
+                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
         }
         return $temparray;
     }
@@ -309,7 +309,7 @@ 
      */
     public function setAnonymousIDSupport($shallwe)
     {
-        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
     }
 
     /** Toggle special username for realm checks
@@ -319,7 +319,7 @@ 
      * @return void
      */
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
-        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
         if ($localpart !== NULL) {
             $this->databaseHandle->exec("UPDATE profile SET checkuser_value = ? WHERE profile_id = $this->identifier", "s", $localpart);
         }
@@ -334,8 +334,8 @@ 
      */
     public function setInputVerificationPreference($verify, $hint)
     {
-        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = " . ($verify === true ? "1" : "0") .
-                ", hint_userinput_suffix = " . ($hint === true ? "1" : "0") .
+        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = ".($verify === true ? "1" : "0").
+                ", hint_userinput_suffix = ".($hint === true ? "1" : "0").
                 " WHERE profile_id = $this->identifier");
     }
 

core/Federation.php

Indentation +2 added lines, -2 removed lines

@@ -454,7 +454,7 @@ 
         $result = $this->databaseHandle->exec($query);
         $rows = $result->fetch_all();
         foreach ($rows as $row) {
-           $activeProfiles[] = $row[0];
+            $activeProfiles[] = $row[0];
         }
         $query = "SELECT institution.inst_id AS inst_id, profile.profile_id AS profile_id, profile_option.option_value AS cert FROM profile_option JOIN profile ON profile_option.profile_id=profile.profile_id JOIN institution ON profile.inst_id=institution.inst_id WHERE profile_option.option_name='eap:ca_file' and institution.country='".$this->tld."'";        
         $result = $this->databaseHandle->exec($query);
@@ -531,7 +531,7 @@ 
                 'country' => strtoupper($idp->federation),
                 'instance' => $idp,
                 'realms' => $idpQuery->realms]
-                 ;
+                    ;
             $returnarray[$idp->identifier] = $idpInfo;
         }
         if ($activeOnly != 0) { // we're only doing this once.

web/diag/radius_tests.php

Spacing +1 added lines, -1 removed lines

@@ -374,7 +374,7 @@
         throw new Exception("Unknown test requested: default case reached!");
 }
 $returnarray['datetime'] = date("Y-m-d H:i:s");
-if ($token!= '' && is_dir($jsonDir.'/'.$token)) {
+if ($token != '' && is_dir($jsonDir.'/'.$token)) {
     @mkdir($jsonDir.'/'.$token, 0777, true);
 }
 $json_data = json_encode($returnarray);

web/admin/overview_federation.php

Indentation +13 added lines, -13 removed lines

@@ -424,17 +424,17 @@ 
                 }
                 echo "<td class='inst_td'>
                          <input type='hidden' name='inst' value='" 
-                       . $index."'>"
-                       . "<span style='display:none' class='inst_name'>".$my_idp."</span>"
-                       . "<span>". $idp_instance->name."</span>"
-                       . " (<a href='overview_org.php?inst_id="
-                       . $idp_instance->identifier."'>" 
-                       . (in_array($index, $userIdps) ? _("manage") : _("view"))
-                       . "</a>)"
-                       . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) 
-                       . implode("</li><li>", $listOfSilverbulletRealms) 
-                       . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" )
-                       . "</td>";
+                        . $index."'>"
+                        . "<span style='display:none' class='inst_name'>".$my_idp."</span>"
+                        . "<span>". $idp_instance->name."</span>"
+                        . " (<a href='overview_org.php?inst_id="
+                        . $idp_instance->identifier."'>" 
+                        . (in_array($index, $userIdps) ? _("manage") : _("view"))
+                        . "</a>)"
+                        . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) 
+                        . implode("</li><li>", $listOfSilverbulletRealms) 
+                        . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" )
+                        . "</td>";
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime                    
                 echo  "<td>$profileIcon</td>";
@@ -489,8 +489,8 @@ 
                             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> "
-                           . sprintf(_("(expires %s)"), $oneinvite['expiry'])
-                           . "</form>";
+                            . sprintf(_("(expires %s)"), $oneinvite['expiry'])
+                            . "</form>";
                         }
                         echo "      </td>";                          
                         echo "         </tr>";

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
     <?php
     foreach ($cat->printCountryList(1) as $country => $name) {
         $selected = '';
-        if ($country == strtoupper($fed_id) ) {
+        if ($country == strtoupper($fed_id)) {
             $selected = 'selected';
         }
     echo "<option value='$country' $selected>$name</option>\n";
@@ -315,7 +315,7 @@ 
             /// nomenclature for 'federation', federation name, nomenclature for 'inst'
             echo "<tr><td colspan='9'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>";
             echo "<tbody class='fedlist'>";
-            echo "<tr><td colspan='1'><strong>". _("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>";
+            echo "<tr><td colspan='1'><strong>"._("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>";
             echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='profilecheck' id='profile_ck_".$fedId."'></td>";
             echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='orcheck' id='or_ck_".$fedId."'></td>";
             echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='brokencert' id='brokencert_ck_".$fedId."'></td>";
@@ -428,14 +428,14 @@ 
                          <input type='hidden' name='inst' value='" 
                        . $index."'>"
                        . "<span style='display:none' class='inst_name'>".$my_idp."</span>"
-                       . "<span>". $idp_instance->name."</span>"
+                       . "<span>".$idp_instance->name."</span>"
                        . " (<a href='overview_org.php?inst_id="
                        . $idp_instance->identifier."'>" 
                        . (in_array($index, $userIdps) ? _("manage") : _("view"))
                        . "</a>)"
-                       . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) 
+                       . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>") 
                        . implode("</li><li>", $listOfSilverbulletRealms) 
-                       . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" )
+                       . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>")
                        . "</td>";
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime