GEANT / CAT

core/User.php

Spacing +5 added lines, -5 removed lines

@@ -154,8 +154,8 @@ 
         common\Entity::intoThePotatoes();
         $mail = \core\common\OutsideComm::mailHandle();
 // who to whom?
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
-        $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname'] . " " . _("Feedback"));
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
+        $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname']." "._("Feedback"));
         $mail->addAddress($mailaddr[0]["value"]);
 // what do we want to say?
         $mail->Subject = $subject;
@@ -218,7 +218,7 @@ 
                 }
                 $lookFor .= "$name";
             }
-            $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches);
+            $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches);
             if ($finding === 0 || $finding === FALSE) {
                 return FALSE;
             }
@@ -236,7 +236,7 @@ 
                         $matchedProviders[] = $idp;
                         $name = $idp;
                         if ($skipCurl == 0) {
-                            $url = \config\Diagnostics::EDUGAINRESOLVER['url'] . "?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
+                            $url = \config\Diagnostics::EDUGAINRESOLVER['url']."?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
                             $ch = curl_init($url);
                             if ($ch === FALSE) {
                                 $loggerInstance->debug(2, "Unable ask eduGAIN about IdP - CURL init failed!");
@@ -252,7 +252,7 @@ 
                             }
                             curl_close($ch);
                         }
-                        $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]] . " - IdP: " . $name;
+                        $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]]." - IdP: ".$name;
                     }
                     break;
                 case $providerStrings[1]:

web/user/faq.php

Spacing +5 added lines, -5 removed lines

@@ -50,19 +50,19 @@ 
 
 array_push($FAQ, [
     'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']),
-    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
+    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
 ]);
 
 array_push($FAQ, [
     'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
 ]);
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == NULL) {
     $text = sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."), \config\ConfAssistant::CONSORTIUM['display_name']);
 } else {
     if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
-        $diagUrl = \config\Master::PATHS['cat_base_url'] . "diag/";
+        $diagUrl = \config\Master::PATHS['cat_base_url']."diag/";
     } else {
         $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'];
     }
@@ -99,8 +99,8 @@ 
     $tocText = "";
     $fullText = "";
     foreach ($FAQ as $faq) {
-        $tocText .= '<a href="#toc' . $counter . '">' . $faq['title'] . "</a><br>\n";
-        $fullText .= "<dt><a name=toc$counter>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n";
+        $tocText .= '<a href="#toc'.$counter.'">'.$faq['title']."</a><br>\n";
+        $fullText .= "<dt><a name=toc$counter>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
         $counter++;
     }
     ?>

core/Options.php

Spacing +4 added lines, -4 removed lines

@@ -142,17 +142,17 @@ 
         foreach (array_keys($this->typeDb) as $name) {
             if ($className === 0) {
                 $tempArray[] = $name;
-            } elseif (preg_match('/^' . $className . ':/', $name) > 0) {
+            } elseif (preg_match('/^'.$className.':/', $name) > 0) {
                 $tempArray[] = $name;
             }
         }
         $returnArray = $tempArray;
         // remove silverbullet-specific options if this deployment is not SB
         foreach ($tempArray as $key => $val) {
-            if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
+            if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
                 unset($returnArray[$key]);
             }
-            if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
+            if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
                 unset($returnArray[$key]);
             }
         }
@@ -172,7 +172,7 @@ 
         if (isset($this->typeDb[$optionname])) {
             return $this->typeDb[$optionname];
         }
-        throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: " . htmlentities($optionname));
+        throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: ".htmlentities($optionname));
     }
 
     /**

config/_config.php

Spacing +6 added lines, -6 removed lines

@@ -21,14 +21,14 @@ 
  */
 
 require_once "autoloader.php";
-require_once __DIR__ . "/../packageRoot.php";
+require_once __DIR__."/../packageRoot.php";
 
 // enable Composer autoloader, if exists
-if (file_exists(__DIR__ . "/../vendor/autoload.php") !== FALSE) {
-    include_once __DIR__ . "/../vendor/autoload.php";
+if (file_exists(__DIR__."/../vendor/autoload.php") !== FALSE) {
+    include_once __DIR__."/../vendor/autoload.php";
 }
 
-if (!file_exists(ROOT . "/config/Master.php")) {
+if (!file_exists(ROOT."/config/Master.php")) {
     echo "Master configuration file not found. You need to configure the product! At least config/Master.php is required!";
     throw new Exception("Master config file not found!");
 }
@@ -36,14 +36,14 @@ 
 /* load sub-configs if we are dealing with those in this installation */
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == 'LOCAL' || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL') {
-    if (!file_exists(ROOT . "/config/ConfAssistant.php")) {
+    if (!file_exists(ROOT."/config/ConfAssistant.php")) {
         echo "ConfAssistant configuration file not found. You need to configure the product!";
         throw new Exception("ConfAssistant config file not found!");
     }
 }
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
-    if (!file_exists(ROOT . "/config/Diagnostics.php")) {
+    if (!file_exists(ROOT."/config/Diagnostics.php")) {
         echo "Diagnostics configuration file not found. You need to configure the product!";
         throw new Exception("Diagnostics config file not found!");
     }

web/admin/edit_federation_result.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
  * @author Stefan Winter <stefan.winter@restena.lu>
  */
 
-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();
@@ -46,18 +46,18 @@ 
 
 if ($submitGiven == web\lib\common\FormElements::BUTTON_SAVE) { // here we go
     $fed_name = $my_fed->name;
-    echo "<h1>" . sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name) . "</h1>";
+    echo "<h1>".sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name)."</h1>";
     echo "<table>";
     echo $optionParser->processSubmittedFields($my_fed, $_POST, $_FILES);
     echo "</table>";
 
     $loggerInstance = new \core\common\Logging();
-    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED " . $my_fed->name . " - attributes changed");
+    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED ".$my_fed->name." - attributes changed");
 
     // re-instantiate ourselves... profiles need fresh data
 
     $my_fed = $validator->existingFederation($_GET['fed_id'], $_SESSION['user']);
 
-    echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+    echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
 }
 echo $deco->footer();

utils/installTranslations.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * License: see the web/copyright.php file in the file structure
  * ******************************************************************************
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 const AREAS = ["web_admin", "web_user", "devices", "core", "diagnostics"];
 foreach (\config\Master::LANGUAGES as $lang => $details) {

web/lib/admin/API.php

Braces +1 added lines, -2 removed lines

@@ -607,8 +607,7 @@
         $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT);
         if ($output === FALSE) {
             $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg());
-        }
-        else {
+        } else {
             echo $output;
         }
     }

Spacing +13 added lines, -13 removed lines

@@ -254,7 +254,7 @@ 
     const ACTIONS = [
         // Inst-level actions.
         API::ACTION_NEWINST_BY_REF => [
-            "REQ" => [API::AUXATTRIB_EXTERNALID,],
+            "REQ" => [API::AUXATTRIB_EXTERNALID, ],
             "OPT" => [
                 'general:geo_coordinates',
                 'general:logo_file',
@@ -271,7 +271,7 @@ 
             "FLAG" => [],
         ],
         API::ACTION_NEWINST => [
-            "REQ" => [API::AUXATTRIB_INSTTYPE,], // "IdP", "SP" or "IdPSP"
+            "REQ" => [API::AUXATTRIB_INSTTYPE, ], // "IdP", "SP" or "IdPSP"
             "OPT" => [
                 'general:instname',
                 'general:geo_coordinates',
@@ -490,7 +490,7 @@ 
     public function scrub($inputJson, $fedObject) {        
         $optionInstance = \core\Options::instance();
         $parameters = [];
-        $allPossibleAttribs = array_merge(API::ACTIONS[$inputJson['ACTION']]['REQ'], API::ACTIONS[$inputJson['ACTION']]['OPT'],  API::ACTIONS[$inputJson['ACTION']]['FLAG']);
+        $allPossibleAttribs = array_merge(API::ACTIONS[$inputJson['ACTION']]['REQ'], API::ACTIONS[$inputJson['ACTION']]['OPT'], API::ACTIONS[$inputJson['ACTION']]['FLAG']);
         // some actions don't need parameters. Don't get excited when there aren't any.
         if (!isset($inputJson['PARAMETERS'])) {
             return [];
@@ -533,7 +533,7 @@ 
                         break;
                 }   
             } elseif (preg_match("/^FLAG-/", $oneIncomingParam['NAME'])) {
-                if ($oneIncomingParam['VALUE'] != "TRUE" && $oneIncomingParam['VALUE'] != "FALSE" ) {
+                if ($oneIncomingParam['VALUE'] != "TRUE" && $oneIncomingParam['VALUE'] != "FALSE") {
                     continue;
                 }
             } else {
@@ -591,8 +591,8 @@ 
 
                 case \core\Options::TYPECODE_COORDINATES:
                     $extension = \core\Options::TYPECODE_TEXT;
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
                     break;
                 case \core\Options::TYPECODE_TEXT:
                 // Fall-through: they all get the same treatment.
@@ -602,18 +602,18 @@ 
                 // Fall-through: they all get the same treatment.
                 case \core\Options::TYPECODE_INTEGER:
                     $extension = $optionInfo['type'];
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
                     if ($optionInfo['flag'] == "ML") {
-                        $coercedInline["value"][$basename . "-lang"] = $oneAttrib['LANG'];
+                        $coercedInline["value"][$basename."-lang"] = $oneAttrib['LANG'];
                     }
                     break;
                 case \core\Options::TYPECODE_FILE:
                     // Binary data is expected in base64 encoding. This is true also for PEM files!
                     $extension = $optionInfo['type'];
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    file_put_contents($dir['dir'] . "/" . $basename . "-" . $extension, base64_decode($oneAttrib['VALUE']));
-                    $coercedFile["value"]['tmp_name'][$basename . "-" . $extension] = $dir['dir'] . "/" . $basename . "-" . $extension;
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    file_put_contents($dir['dir']."/".$basename."-".$extension, base64_decode($oneAttrib['VALUE']));
+                    $coercedFile["value"]['tmp_name'][$basename."-".$extension] = $dir['dir']."/".$basename."-".$extension;
                     break;
                 default:
                     throw new Exception("We don't seem to know this type code!");
@@ -642,7 +642,7 @@ 
     public function returnSuccess($details) {
         $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT);
         if ($output === FALSE) {
-            $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg());
+            $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ".json_last_error()." - ".json_last_error_msg());
         }
         else {
             echo $output;

web/admin/112365365321.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . '/config/_config.php';
+require_once dirname(dirname(__DIR__)).'/config/_config.php';
 
 $uiElements = new web\lib\admin\UIElements();
 
@@ -75,7 +75,7 @@ 
                         // filesystem cleanup
                     case web\lib\common\FormElements::BUTTON_DELETE:
                         $i = web\lib\admin\Maintenance::deleteObsoleteTempDirs();
-                        echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>";
+                        echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>";
                         break;
                     default:
                         break;
@@ -141,7 +141,7 @@ 
                     $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'");
                     // SELECT -> mysqli_result, not boolean
                     while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
-                        echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>";
+                        echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>";
                         $gross_admin = $gross_admin + $a->admin;
                         $gross_user = $gross_user + $a->user;
                         $gross_silverbullet = $gross_silverbullet + $a->silverbullet;

web/admin/overview_sp.php

Indentation +4 added lines, -4 removed lines

@@ -150,8 +150,8 @@ 
                         <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'] . "'>";
+                                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . 
+                                        "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
                             ?>
                         </td>
                     </tr>
@@ -173,8 +173,8 @@ 
                         <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'] . "'>";
+                                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . 
+                                        "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
                             ?>
                         </td>
                     </tr>

Spacing +25 added lines, -25 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();
@@ -38,7 +38,7 @@ 
 } else {
     $link = 'http://';
 }
-$link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'];
+$link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
 $link = htmlspecialchars($link);
 
 echo $deco->defaultPagePrelude(sprintf(_("%s: %s Dashboard"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureHotspot));
@@ -102,21 +102,21 @@ 
         <?php
         if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
             echo "<tr>
-                        <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"),$uiElements->nomenclatureInst) . "</td>
+                        <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"), $uiElements->nomenclatureInst)."</td>
                         <td><form method='post' action='../diag/action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'>
                               <!--<input type='text' name='realm' id='realm'>-->
                               <input type='hidden' name='comefrom' id='comefrom' value='$link'/>
-                              <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button>
                             </form>
                         </td>
                     </tr>";
         }
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam") { // SW: APPROVED
             echo "<tr>
-                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed) . "</td>
+                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed)."</td>
                         <td>
                            <form action='https://monitor.eduroam.org/mon_direct.php' accept-charset='UTF-8'>
-                              <button style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button style='cursor:pointer;' type='submit'>" . _("Go!")."</button>
                            </form>
                         </td>
                     </tr>";
@@ -127,10 +127,10 @@ 
     <?php
     $hotspotProfiles = $my_inst->listDeployments();
     if (count($hotspotProfiles) == 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>";
     }
     if (count($hotspotProfiles) > 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot)."</h2>";
         // display an info box with the connection data
     }
    
@@ -149,19 +149,19 @@ 
         ?>
         <div style='display: table-row_id; margin-bottom: 20px;'>
             <div class='profilebox' style='display: table-cell;'>
-                <h2><?php echo core\DeploymentManaged::PRODUCTNAME . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2>
+                <h2><?php echo core\DeploymentManaged::PRODUCTNAME." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2>
                 <table>
                     <tr>
                         <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>
@@ -169,9 +169,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>
@@ -179,22 +179,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>
@@ -245,12 +245,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>';
                                             }
                                         }
                                     }
@@ -270,12 +270,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>';
                                             }
                                         }
                                     }