GEANT / CAT

devices/eap_config/DeviceXML.php

Spacing +5 added lines, -5 removed lines

@@ -144,7 +144,7 @@ 
         $dom = new \DOMDocument('1.0', 'utf-8');
         $root = $dom->createElement($rootname);
         $dom->appendChild($root);
-        $ns = $dom->createAttributeNS( 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation' );
+        $ns = $dom->createAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation');
         $ns->value = "eap-metadata.xsd";
         $root->appendChild($ns);
         $this->openRoamingToU = sprintf(_("I have read and agree to OpenRoaming Terms of Use at %s."), "https://wballiance.com/openroaming/toc-2020/");
@@ -181,7 +181,7 @@ 
                 if ($netDefinition['condition'] === 'internal:openroaming' &&
                         $this->attributes['internal:openroaming']) {
                     $this->setORtou();
-                    if (preg_match("/^ask/",$this->attributes['media:openroaming'][0])) {
+                    if (preg_match("/^ask/", $this->attributes['media:openroaming'][0])) {
                         $orNetwork = $netDefinition;
                         continue;                        
                     }
@@ -238,7 +238,7 @@ 
     }
     
     private function setORtou() {
-        if (preg_match("/preagreed/",$this->attributes['media:openroaming'][0])) {
+        if (preg_match("/preagreed/", $this->attributes['media:openroaming'][0])) {
             $this->addORtou = false;
         } else {
             $this->addORtou = true;
@@ -262,7 +262,7 @@ 
         $authMethods = new \core\DeviceXMLmain();
         $authMethods->setChild('AuthenticationMethod', $this->authMethodsList);
         $eapIdp->setChild('AuthenticationMethods', $authMethods);
-        $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids,$oids));
+        $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids, $oids));
 // TODO   $eap_idp->setChild('ValidUntil',$this->getValidUntil());
         $eapIdp->setChild('ProviderInfo', $this->providerInfo);
 // TODO   $eap_idp->setChild('VendorSpecific',$this->getVendorSpecific());
@@ -416,7 +416,7 @@ 
                 $lng = $lngAttr['lang'] === 'any' ? \config\Master::APPEARANCE['defaultlocale'] : $lngAttr['lang'];
                 $tou .= "\n".$this->openRoamingToUArray[$lng];
                 $touObj->setValue($tou);
-                $out[] =  $touObj;
+                $out[] = $touObj;
             } 
         } else {
             $tou = $standardTou[0];

web/admin/overview_org.php

Indentation +1 added lines, -1 removed lines

@@ -654,7 +654,7 @@
                             </button>
                             <span style='color: red;'>
                             <?php if ($hasMail == 0) { 
-                              echo _("Helpdesk mail address is required but missing!");  
+                                echo _("Helpdesk mail address is required but missing!");  
                             }
                             ?>
                             </span>

Spacing +45 added lines, -45 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) {
     ?>
@@ -43,14 +43,14 @@ 
                 <ul style='margin:1px'>
                     <?php
                     foreach ($completeness as $missing_attrib) {
-                        echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                        echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
                     }
                     ?>
                 </ul>
             </div>
             <?php
         } else {
-            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
+            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
         }
         ?>
         <br/>
@@ -59,7 +59,7 @@ 
         if ($readonly === FALSE) {
             ?>
             <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&amp;profile_id=<?php echo $theProfile->identifier; ?>' method='POST'>
-                <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
+                <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
             </form>
             <?php
         }
@@ -94,21 +94,21 @@ 
                 $has_overrides = TRUE;
             }
         }
-        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
+        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>";
         $typelist = $theProfile->getEapMethodsinOrderOfPreference();
         $allcomplete = TRUE;
         foreach ($typelist as $eaptype) {
             $buffer_eaptypediv .= $eaptype->getPrintableRep();
             $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype);
             if ($completeness === true) {
-                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
+                $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>";
             } else {
                 $buffer_eaptypediv .= " <div class='notacceptable'>";
                 $buffer_eaptypediv .= _("Information needed!");
                 if (is_array($completeness)) {
                     $buffer_eaptypediv .= "<ul style='margin:1px'>";
                     foreach ($completeness as $missing_attrib) {
-                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                        $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>";
                     }
                     $buffer_eaptypediv .= "</ul>";
                 }
@@ -120,7 +120,7 @@ 
             foreach ($attribs as $attrib) {
                 if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
                     $justOnce = TRUE;
-                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>";
                 }
             }
             $buffer_eaptypediv .= "<br/>";
@@ -166,11 +166,11 @@ 
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
                     $diagUrl = "../diag/";
                 } else {
-                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
+                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
                 }
                 ?>
-                <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
-                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/>
+                <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
+                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/>
                     <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'>
                         <?php echo _("Check realm reachability"); ?>
                     </button>
@@ -203,9 +203,9 @@ 
                 ?>
                 <div style='display: flex;'>
                     <?php
-                    $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution;
-                    $displayurl = $idpLevelUrl . "&amp;profile=" . $theProfile->identifier;
-                    $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier;
+                    $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution;
+                    $displayurl = $idpLevelUrl."&amp;profile=".$theProfile->identifier;
+                    $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier;
                     $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
                                 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
                                 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H,
@@ -217,9 +217,9 @@ 
                     if (empty($rawQr)) {
                         throw new Exception("Something went seriously wrong during QR code generation!");
                     }
-                    $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
+                    $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
                     $size = getimagesize($uri);
-                    echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
+                    echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>";
 
                     //echo "<nobr>$displayurl</nobr></a>";
                     echo "<p>$displayurl</p></a>";
@@ -263,7 +263,7 @@ 
             <h2><?php
                 switch ($deploymentObject->consortium) {
                     case "eduroam":
-                        $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME;
+                        $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME;
                         break;
                     case "OpenRoaming":
                         $displayname = "OpenRoaming ANP";
@@ -271,7 +271,7 @@ 
                     default:
                         throw new Exception("We are supposed to operate on a roaming consortium we don't know.");
                 }
-                echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)";
+                echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)";
                 ?></h2>
             <table>
                 <caption><?php echo _("Deployment Details"); ?></caption>
@@ -285,13 +285,13 @@ 
                     <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
                         <?php
                         if ($deploymentObject->host1_v4 !== NULL) {
-                            echo _("IPv4") . ": " . $deploymentObject->host1_v4;
+                            echo _("IPv4").": ".$deploymentObject->host1_v4;
                         }
                         if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
                             echo "<br/>";
                         }
                         if ($deploymentObject->host1_v6 !== NULL) {
-                            echo _("IPv6") . ": " . $deploymentObject->host1_v6;
+                            echo _("IPv6").": ".$deploymentObject->host1_v6;
                         }
                         ?>
                     </td>
@@ -299,9 +299,9 @@ 
                     <td><?php echo $deploymentObject->port1; ?></td>
                     <td>
                         <?php
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] .
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] .
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon'].
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text'].
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
                         ?>
                     </td>
                 </tr>
@@ -309,22 +309,22 @@ 
                     <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
                         <?php
                         if ($deploymentObject->host2_v4 !== NULL) {
-                            echo _("IPv4") . ": " . $deploymentObject->host2_v4;
+                            echo _("IPv4").": ".$deploymentObject->host2_v4;
                         }
                         if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
                             echo "<br/>";
                         }
                         if ($deploymentObject->host2_v6 !== NULL) {
-                            echo _("IPv6") . ": " . $deploymentObject->host2_v6;
+                            echo _("IPv6").": ".$deploymentObject->host2_v6;
                         }
                         ?></td>
                     <td><?php echo _("RADIUS port number: ") ?></td>
                     <td><?php echo $deploymentObject->port2; ?></td>
                     <td>
                         <?php
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] .
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>";
                         ?>
                     </td>
                 </tr>
@@ -376,12 +376,12 @@ 
                             if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
                                 echo '<br>';
                                 if ($res['FAILURE'] == 2) {
-                                    echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
+                                    echo ' <span style="color: red;">'._("Activation failure.").'</span>';
                                 } else {
                                     if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                        echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
                                     } else {
-                                        echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
                                     }
                                 }
                             }
@@ -408,12 +408,12 @@ 
                                 if ($res['FAILURE'] > 0) {
                                     echo '<br>';
                                     if ($res['FAILURE'] == 2) {
-                                        echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
+                                        echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
                                     } else {
                                         if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
                                         } else {
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
                                         }
                                     }
                                 }
@@ -434,22 +434,22 @@ 
         </div>
         <div style='width:20px;'></div> <!-- QR code space, reserved -->
         <div style='display: table-cell; min-width:200px;'>
-            <?php $tablecaption = _("Hotspot Usage Statistics");?>
+            <?php $tablecaption = _("Hotspot Usage Statistics"); ?>
             <h1><?php echo $tablecaption; ?></h1>
-            <h2><?php echo _("5 most recent authentications");?></h2>
+            <h2><?php echo _("5 most recent authentications"); ?></h2>
             <table class='authrecord'>
-    <caption><?php echo $tablecaption;?></caption>
+    <caption><?php echo $tablecaption; ?></caption>
     <tr style='text-align: left;'>
-        <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th>
-        <th scope="col"><strong><?php echo _("Realm");?></strong></th>
-        <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
-        <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th>
-        <th scope="col"><strong><?php echo _("Result");?></strong></th>
+        <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Realm"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
     </tr>
     <?php
-    $userAuthData = $deploymentObject->retrieveStatistics(0,5);
+    $userAuthData = $deploymentObject->retrieveStatistics(0, 5);
     foreach ($userAuthData as $oneRecord) {
-        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>"
+        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>"
                 . "<td>".$oneRecord['activity_time']."</td>"
                 . "<td>".$oneRecord['realm']."</td>"
                 . "<td>".$oneRecord['mac']."</td>"
@@ -659,7 +659,7 @@ 
                         <div>
                             <input type="hidden" name="consortium" value="eduroam"/>
                             <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'>
-                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?>
+                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?>
                             </button>
                             <span style='color: red;'>
                             <?php if ($hasMail == 0) { 

web/admin/inc/deploymentStats.inc.php

Spacing +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
  * ******************************************************************************
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $auth->authenticate();
@@ -38,18 +38,18 @@ 
 
 <h1><?php $tablecaption = _("Deployment Usage Records"); echo $tablecaption; ?></h1>
 <table class='authrecord'>
-    <caption><?php echo $tablecaption;?></caption>
+    <caption><?php echo $tablecaption; ?></caption>
     <tr>
-        <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th>
-        <th scope="col"><strong><?php echo _("Realm");?></strong></th>
-        <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
-        <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th>
-        <th scope="col"><strong><?php echo _("Result");?></strong></th>
+        <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Realm"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
     </tr>
     <?php
     $userAuthData = $deployment->retrieveStatistics($backlogTime);
     foreach ($userAuthData as $oneRecord) {
-        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>"
+        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>"
                 . "<td>".$oneRecord['activity_time']."</td>"
                 // $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here
                 . "<td>".$oneRecord['realm']."</td>"

web/admin/edit_hotspot.php

Switch Indentation +6 added lines, -6 removed lines

@@ -156,12 +156,12 @@
     }
     if (isset($_POST['command'])) {
         switch ($_POST['command']) {
-        case web\lib\common\FormElements::BUTTON_CLOSE:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
-            exit(0);
-        default:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
-            exit(0);
+            case web\lib\common\FormElements::BUTTON_CLOSE:
+                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                exit(0);
+            default:
+                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                exit(0);
         }
     }
     $vlan = $deployment->getAttributes("managedsp:vlan")[0]['value'] ?? NULL;

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -36,12 +36,12 @@ 
 $myfed = new \core\Federation($my_inst->federation);
 
 if (!isset($_GET['deployment_id'])) {
-    if (isset($_POST['consortium']) && ( $_POST['consortium'] == "eduroam" ||
-            ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 )
+    if (isset($_POST['consortium']) && ($_POST['consortium'] == "eduroam" ||
+            ($_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0)
             )
     ) {
         $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier);
         exit(0);
     } else {
         throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!");
@@ -99,19 +99,19 @@ 
                 if (isset($_POST['agreement']) && $_POST['agreement'] == "true") {
                     $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1);
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_DELETE:
                 $response = $deployment->setRADIUSconfig();
                 if (in_array('OK', $response)) {
                     $deployment->deactivate();
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
                 exit(0);
             case web\lib\common\FormElements::BUTTON_REMOVESP:
                 error_log("MGW Remove deployment ".serialize($deployment));
                 $deployment->remove();
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_ACTIVATE:
                 if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) {
@@ -119,7 +119,7 @@ 
                     if (in_array('OK', $response)) {
                         $deployment->activate();
                     }
-                    header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+                    header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
                     exit(0);
                 } else {
                     throw new Exception("Activate button pushed without acknowledged ToUs!");
@@ -148,7 +148,7 @@ 
                 } else {
                     $response = ['NOOP', 'NOOP'];
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
                 exit(0);
             default:
                 throw new Exception("Unknown button action requested!");
@@ -157,10 +157,10 @@ 
     if (isset($_POST['command'])) {
         switch ($_POST['command']) {
         case web\lib\common\FormElements::BUTTON_CLOSE:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier);
             exit(0);
         default:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier);
             exit(0);
         }
     }
@@ -187,7 +187,7 @@ 
     echo $uiElements->instLevelInfoBoxes($my_inst);
     $deploymentOptions = $deployment->getAttributes();
     echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&amp;deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'>
-                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+                <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>";
     $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE);
     ?>
     <fieldset class='option_container' id='managedsp_override'>
@@ -221,7 +221,7 @@ 
                 <!-- input for VLAN identifier for home users-->
                 <td>
                     <span id='vlan_label'>
-                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
+                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
                     </span>
                 </td>
                 <td>
@@ -241,7 +241,7 @@ 
     </fieldset>
 
     <?php
-    echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
+    echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
     echo $deco->footer();
 
     
\ No newline at end of file

core/DeploymentManaged.php

Spacing +22 added lines, -22 removed lines

@@ -290,7 +290,7 @@ 
                 $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id;
             }
             if ($clients > $maxSupportedClients * 0.9) {
-                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!");
+                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!");
             }
         }
         if (count($serverCandidates) == 0 && $federation != "DEFAULT") {
@@ -329,7 +329,7 @@ 
             $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND)";
             $conditional2 = "";
         }
-        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName );
+        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName);
         return mysqli_fetch_all($stats, \MYSQLI_ASSOC);
     }
         
@@ -446,7 +446,7 @@ 
     {
         $customAttrib = $this->getAttributes("managedsp:operatorname");
         if (count($customAttrib) == 0) {
-            return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
+            return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix'];
         }
         return $customAttrib[0]["value"];
     }
@@ -462,13 +462,13 @@ 
     {
 
         $hostname = "radius_hostname_$idx";
-        $ch = curl_init("http://" . $this->$hostname);
+        $ch = curl_init("http://".$this->$hostname);
         if ($ch === FALSE) {
             $res = 'FAILURE';
         } else {
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
-            $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $post\n");
+            $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $post\n");
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
             curl_setopt($ch, CURLOPT_HEADER, 0);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -507,19 +507,19 @@ 
         } else {
             $txt = $remove ? _('Profile deactivation failed') : _('Profile activation/modification failed');
         }
-        $txt = $txt . ' ';
+        $txt = $txt.' ';
         if (array_count_values($response)[$status] == 2) {
-            $txt = $txt . _('on both RADIUS servers: primary and backup') . '.';
+            $txt = $txt._('on both RADIUS servers: primary and backup').'.';
         } else {
             if ($response['res[1]'] == $status) {
-                $txt = $txt . _('on primary RADIUS server') . '.';
+                $txt = $txt._('on primary RADIUS server').'.';
             } else {
-                $txt = $txt . _('on backup RADIUS server') . '.';
+                $txt = $txt._('on backup RADIUS server').'.';
             }
         }
         $mail = \core\common\OutsideComm::mailHandle();
         $email = $this->getAttributes("support:email")[0]['value'];
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
         $mail->addAddress($email);
         if ($status == 'OK') {
             $mail->Subject = _('RADIUS profile update problem fixed');
@@ -553,7 +553,7 @@ 
             return NULL;
         }
         $timeout = 10;
-        curl_setopt($ch, CURLOPT_URL, 'http://' . $host);
+        curl_setopt($ch, CURLOPT_URL, 'http://'.$host);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
         curl_exec($ch);
@@ -645,33 +645,33 @@ 
     {
         $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1;
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
-        $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&';
+        $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&';
         if ($remove) {
-            $toPostTemplate = $toPostTemplate . 'remove=1&';
+            $toPostTemplate = $toPostTemplate.'remove=1&';
         } else {
-            $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getOperatorName() . '&'; 
+            $toPostTemplate = $toPostTemplate.'operatorname='.$this->getOperatorName().'&'; 
             if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) {
                 $allRealms = $this->getAllRealms();
                 if (!empty($allRealms)) {
-                    $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&';
-                    $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&';
+                    $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&';
+                    $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&';
                 }
             }
         }
         foreach (array_keys($toPost) as $key) {
-            $elem = 'port' . $key;
-            $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem;
+            $elem = 'port'.$key;
+            $toPost[$key] = $toPostTemplate.'port='.$this->$elem;
         }
         $response = array();
         foreach ($toPost as $key => $value) {
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
-            $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
+            $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
         }
         if ($onlyone) {
-            $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK;
+            $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK;
         }
         foreach (array('OK', 'FAILURE') as $status) {
-            if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) {
+            if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) {
                 $this->sendMailtoAdmin($remove, $response, $status);
             }
         }

web/lib/admin/UIElements.php

Spacing +33 added lines, -33 removed lines

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