GEANT / CAT

web/admin/inc/profileAutodetectCA.inc.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 ?>
 <?php
-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();
 $languageInstance = new \core\common\Language();

web/admin/overview_user.php

Spacing +14 added lines, -14 removed lines

@@ -21,7 +21,7 @@ 
 
 namespace core;
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $instMgmt = new \core\UserManagement();
 $deco = new \web\lib\admin\PageDecoration();
@@ -61,7 +61,7 @@ 
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
             <tr>
                 <td>
-                    <?php echo "" . _("Unique Identifier") ?>
+                    <?php echo ""._("Unique Identifier") ?>
                 </td>
                 <td>
                 </td>
@@ -74,14 +74,14 @@ 
     <div>
         <?php
         if (\config\Master::DB['USER']['readonly'] === FALSE) {
-            echo "<a href='edit_user.php'><button>" . _("Edit User Details") . "</button></a>";
+            echo "<a href='edit_user.php'><button>"._("Edit User Details")."</button></a>";
         }
 
         if ($user->isFederationAdmin()) {
-            echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed) . "</button></form>";
+            echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>".sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed)."</button></form>";
         }
         if ($user->isSuperadmin()) {
-            echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to access the superadmin page') . "</button></form>";
+            echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>"._('Click here to access the superadmin page')."</button></form>";
         }
         ?>
     </div>
@@ -94,7 +94,7 @@ 
         if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
             $target = "https://wiki.geant.org/x/6Zg7Bw"; // Managed IdP manual
         }
-        $helptext = "<h3 style='display:inline;'>" . sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureParticipant) . "</h3>";
+        $helptext = "<h3 style='display:inline;'>".sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureParticipant)."</h3>";
     } else {
         $helptext = "";
     }
@@ -103,7 +103,7 @@ 
         // we need to run the Federation constructor
         $cat = new \core\CAT;
         /// first parameter: number of Identity Providers; second param is the literal configured term for 'Identity Provider' (you may or may not be able to add a plural suffix for your locale)
-        echo "<h2>" . sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureParticipant) . "</h2>";
+        echo "<h2>".sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureParticipant)."</h2>";
         $instlist = [];
         $my_idps = [];
         $myFeds = [];
@@ -196,14 +196,14 @@ 
                         <td>
                             <?php
                             if ($blessedUser && \config\Master::DB['INST']['readonly'] === FALSE) {
-                                echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $the_inst->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>" . _("Add/Remove Administrators") . "</button></form></div>";
+                                echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=".$the_inst->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>"._("Add/Remove Administrators")."</button></form></div>";
                             }
                             ?>
                         </td>
                         <td> <!-- danger zone --> 
 
                             <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
-                                <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( \config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL ? sprintf(_("After deleting the %s, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed) . " " : "" ) . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclatureParticipant); ?></button>
+                                <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL ? sprintf(_("After deleting the %s, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed)." " : "").sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclatureParticipant); ?></button>
                             </form>
                             <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
                                 <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART; ?>' onclick="return confirm('<?php echo sprintf(_("This action will delete all properties of the %s and start over the configuration from scratch. Do you really want to reset all settings of the %s %s?"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Reset all %s settings"), $uiElements->nomenclatureParticipant); ?></button>
@@ -218,18 +218,18 @@ 
         </table>
         <?php
     } else {
-        echo "<h2>" . sprintf(_("You are not managing any %s."), $uiElements->nomenclatureParticipant) . "</h2>";
+        echo "<h2>".sprintf(_("You are not managing any %s."), $uiElements->nomenclatureParticipant)."</h2>";
     }
     if (\config\Master::DB['INST']['readonly'] === FALSE) {
         if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL) {
-            echo "<p>" . sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant) . "</p>";
+            echo "<p>".sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant)."</p>";
             echo "<hr/>
              <div style='white-space: nowrap;'>
                 <form action='action_enrollment.php' method='get' accept-charset='UTF-8'>" .
-            sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant) .
+            sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant).
             "        <input type='text' id='token' name='token'/>
                     <button type='submit'>" .
-            _("Go!") . "
+            _("Go!")."
                     </button>
                 </form>
              </div>";
@@ -238,7 +238,7 @@ 
             <div style='white-space: nowrap;'>
         <form action='action_enrollment.php' method='get'><button type='submit' accept-charset='UTF-8'>
                 <input type='hidden' id='token' name='token' value='SELF-REGISTER'/>" .
-            sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant) . "
+            sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant)."
             </button>
         </form>
         </div>";

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/inc/deploymentStats.inc.php

Spacing +10 added lines, -10 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();
@@ -37,21 +37,21 @@ 
 ?>
 
 <h1><?php $tablecaption = _("Deployment Usage Records"); echo $tablecaption; ?></h1>
-<p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p>
+<p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p>
 <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 _("AP Identifier");?></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>
+        <th scope="col"><strong><?php echo _("AP Identifier"); ?></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>"

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, ap_id FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName );
+        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id 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);
             }
         }

utils/cert_user_correlation.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  * It works on two CAs, the RSA and ECDSA variant. There is a separate temp
  * subdir for both ( temp_ocsp_RSA and temp_ocsp_ECDSA ).
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 /* If the RADIUS server is supposed to generate meaningful (temporally stable,
  * per user, per SP identifiers, then it needs to compute them on the username,

web/admin/overview_installers.php

Spacing +9 added lines, -9 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";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -55,10 +55,10 @@ 
             <?php
             foreach ($preflist as $method) {
                 $escapedMethod = $method->getIntegerRep();
-                echo "<th  scope='col' style='min-width:200px'>" . $method->getPrintableRep() . "<br/>
+                echo "<th  scope='col' style='min-width:200px'>".$method->getPrintableRep()."<br/>
                         <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&amp;profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                         <input type='hidden' name='eaptype' value='$escapedMethod'>
-                        <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button>
+                        <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button>
                         </form></th>";
             }
             ?>
@@ -78,10 +78,10 @@ 
                 continue;
             }
             echo "<tr>";
-            echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/>
+            echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/>
                         <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&amp;profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                         <input type='hidden' name='device' value='$index'>
-                        <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button>
+                        <button class='redirect' type='submit'>"._("Device-specific options...")."</button>
                         </form>
                         </td>";
             $defaultisset = FALSE;
@@ -90,13 +90,13 @@ 
                 $display_footnote = FALSE;
                 $langObject = new \core\common\Language();
                 $downloadform = "<span style='display:ruby;'>";
-                $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])];  /* eduroam */
+                $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])]; /* eduroam */
                 if (sizeof($my_profile->getAttributes("media:openroaming")) > 0 && isset($factory->device->options['hs20']) && $factory->device->options['hs20'] == 1) {
                     $formDiffs["<input type='hidden' name='openroaming'  value='1'/>"] = sprintf(_("%s + OpenRoaming<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name']); /* eduroam + OpenRoaming */
                 }
 
                 foreach ($formDiffs as $inputField => $text) {
-                    $downloadform .= "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'>
+                    $downloadform .= "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'>
                                        <input type='hidden' name='device' value='$index'/>
                                        <input type='hidden' name='generatedfor'  value='admin'/>
                                        $inputField
@@ -150,7 +150,7 @@ 
                                     $distinctFootnotes[$num_footnotes] = $oneFootnote;
                                 }
                                 $numberToDisplay = array_keys($distinctFootnotes, $oneFootnote);
-                                echo "(" . $numberToDisplay[0] . ")";
+                                echo "(".$numberToDisplay[0].")";
                             }
                         }
                         echo "</td>";
@@ -179,7 +179,7 @@ 
     </table>
     <?php
     if (count($distinctFootnotes)) {
-        echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>";
+        echo "<p><strong>"._("Footnotes:")."</strong></p><table>";
         foreach ($distinctFootnotes as $number => $text) {
             echo "<tr><td>($number) - </td><td>$text</td></tr>";
         }

web/lib/user/TextTemplates.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 const DOWNLOAD_FOR_MESSAGE = 1055;
 const SB_GO_AWAY = 1060;
 const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061;
-const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062;
+const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062;
 
 
 /**
@@ -104,13 +104,13 @@ 
         ];
         $this->templates[WELCOME_ABOARD_TERMS] = "";
         foreach ($this->templates[NETWORK_TERMS_AND_PRIV] as $consortium => $terms) {
-            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("Please remember that when connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU_LINK'], $terms['PRIV_LINK']);
+            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>"._("Please remember that when connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.")."</p>", $consortium, $terms['TOU_LINK'], $terms['PRIV_LINK']);
         }
     //    $this->templates[WELCOME_ABOARD_TERMS] .= "<p>"._("I agree to be bound by these Terms and Conditions.")."</p>";
         $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads");
         $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("We would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']);
-        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),\config\ConfAssistant::CONSORTIUM['display_name']);
+        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation");
         $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']);

devices/ms/MsLanProfile.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $dom = new \DOMDocument('1.0', 'utf-8');
         $root = $dom->createElement($rootname);
         $dom->appendChild($root);
-        $ns = $dom->createAttributeNS( null, 'xmlns' );
+        $ns = $dom->createAttributeNS(null, 'xmlns');
         $ns->value = "http://www.microsoft.com/networking/LAN/profile/v1";
         $root->appendChild($ns);        
         \core\DeviceXMLmain::marshalObject($dom, $root, 'WLANprofile', $this->getLANprofile(), '', true);