GEANT / CAT

utils/test_openroaming.php

Spacing +2 added lines, -2 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";
 
 /**
  * The sctipt will be called from crontab
@@ -28,7 +28,7 @@ 
 }
 
 
-while ( $row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) {
+while ($row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) {
     $profileId = $row->profile_id;
     $profile = \core\ProfileFactory::instantiate($profileId);
     $res = $profile->openroamingReadinessTest();

web/admin/overview_radsec_readiness.php

Spacing +22 added lines, -22 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";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -82,9 +82,9 @@ 
         echo '<br/>';
         echo _("In the 'Timestamp' column we show last update time.");
         echo '<p/>';
-        echo _('To check eduroam database specification see') . 
-                ' <a target="_blank" href="https://monitor.eduroam.org/eduroam-database/v2/docs/eduroam-database-ver30112021.pdf">' .
-                _('this document') . '</a>.<p/>';
+        echo _('To check eduroam database specification see'). 
+                ' <a target="_blank" href="https://monitor.eduroam.org/eduroam-database/v2/docs/eduroam-database-ver30112021.pdf">'.
+                _('this document').'</a>.<p/>';
         echo _('If you cannot find your institution on this list it means that this institution is not present in your upstream data.');        
         echo '<p/>';
         $allAuthorizedFeds = $user->getAttributes("user:fedadmin");
@@ -93,11 +93,11 @@ 
         ?>
         
     <select name="INST-list" id="INST-list">
-        <option value=""><?php echo _('---PLEASE CHOOSE---');?></option>
+        <option value=""><?php echo _('---PLEASE CHOOSE---'); ?></option>
         <?php 
         $instdata = array();
         foreach ($extInsts as $iid => $oneInst) {
-            print '<option value="' . $iid . '">' . $oneInst['name'] . '</option>';
+            print '<option value="'.$iid.'">'.$oneInst['name'].'</option>';
             $instdata[$iid] = array();
             $instdata[$iid]['name'] = $oneInst['name'];   
             $instdata[$iid]['type'] = _('no data');
@@ -111,22 +111,22 @@ 
             $contactdata = '';
             foreach ($oneInst['contacts'] as $oneContact) {
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['name']) {
-                    $contactdata = $contactdata . $oneContact['name'];
+                    $contactdata = $contactdata.$oneContact['name'];
                 }
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['mail']) {
-                    $contactdata = $contactdata . $oneContact['mail'];
+                    $contactdata = $contactdata.$oneContact['mail'];
                 }
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['phone']) {
-                    $contactdata = $contactdata . $oneContact['phone'];
+                    $contactdata = $contactdata.$oneContact['phone'];
                 }        
             }
             if ($contactdata == '') {
@@ -145,11 +145,11 @@ 
             var instts = [];
             <?php
             foreach (array_keys($instdata) as $iid) {
-                echo "instservers['" . $iid . "']='" . $instdata[$iid]['servers']. "';\n";
-                echo "instname['" . $iid . "']='" . $instdata[$iid]['name']. "';\n";
-                echo "insttype['" . $iid . "']='" . $instdata[$iid]['type']. "';\n";
-                echo "instcontact['" . $iid . "']='" . $instdata[$iid]['contacts']. "';\n";
-                echo "instts['" . $iid . "']='" . $instdata[$iid]['ts']. "';\n";
+                echo "instservers['".$iid."']='".$instdata[$iid]['servers']."';\n";
+                echo "instname['".$iid."']='".$instdata[$iid]['name']."';\n";
+                echo "insttype['".$iid."']='".$instdata[$iid]['type']."';\n";
+                echo "instcontact['".$iid."']='".$instdata[$iid]['contacts']."';\n";
+                echo "instts['".$iid."']='".$instdata[$iid]['ts']."';\n";
             }
             ?>
             $(document).ready(function(){
@@ -171,18 +171,18 @@ 
     <div id="instdata_area">
         <table>
             <tr><th align="left" width="350">
-                    <?php echo _('Name');?>
+                    <?php echo _('Name'); ?>
                 </th><th align="left" width="100">
-                    <?php echo _('Type');?>
+                    <?php echo _('Type'); ?>
                 </th>
                 <th align="left" width="200">
-                    <?php echo _('Servers');?>
+                    <?php echo _('Servers'); ?>
                 </th>
                 <th align="left" width="200">
-                    <?php echo _('Contact data');?>
+                    <?php echo _('Contact data'); ?>
                 </th>
                 <th align="left" width="100">
-                    <?php echo _('Timestamp');?>
+                    <?php echo _('Timestamp'); ?>
                 </th>
             </tr>
             <tr id="toshow"></tr>

web/lib/admin/MapGoogle.php

Spacing +14 added lines, -14 removed lines

@@ -47,7 +47,7 @@ 
     public function htmlHeadCode() {
         $cat = new \core\CAT();
         \core\common\Entity::intoThePotatoes();
-        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . \config\Master::APPEARANCE['google_maps_api_key'] . "'></script>
+        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".\config\Master::APPEARANCE['google_maps_api_key']."'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;
@@ -103,19 +103,19 @@ 
          *
          */
         function locator_magic() {
-            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName) . "\", 'region':\"" . strtolower($this->fedName) . "\"},
+            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName)."\", 'region':\"".strtolower($this->fedName)."\"},
             function(r,status) {
                 if(status != google.maps.GeocoderStatus.OK) {
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name'] . "\");
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name']."\");
                 } else {
                     var i;
                     for(i = 0; i < r.length; i++) {
                         Addr = getAddressElements(r[i].address_components);
-                        if(Addr.country == \"" . strtoupper($this->fedName) . "\")
+                        if(Addr.country == \"" . strtoupper($this->fedName)."\")
                         break;
                     }
-                    if(Addr.country != \"" . strtoupper($this->fedName) . "\")
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name'] . "\");
+                    if(Addr.country != \"" . strtoupper($this->fedName)."\")
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name']."\");
                     else {
                         addMarker(r[i].geometry.location,15,null);
                     }
@@ -128,7 +128,7 @@ 
          */
         function markerClicked(m) {
             info_window.close();
-            var t = \"" . _("This is location ") . "\"+m.info;
+            var t = \"" . _("This is location ")."\"+m.info;
             info_window.setContent(t);
             info_window.setPosition(m.getPosition());
             info_window.open(map,m);
@@ -207,7 +207,7 @@ 
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             geocoder.geocode( { 'address': city}, function(results, status) {
@@ -227,7 +227,7 @@ 
          * trigger geolocation
          */
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_success,locate_fail,{maximumAge:3600000, timeout:5000});
         }
 
@@ -345,7 +345,7 @@ 
         if ($this->readOnly) {
             return "<div id='map' class='googlemap'></div>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<div id='map' class='googlemap'></div>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<div id='map' class='googlemap'></div>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -358,11 +358,11 @@ 
      */
     public static function optionListDisplayCode($coords, $number) {
         // quiesce warnings about unused variable
-        if (strlen(sprintf("%s", $coords)) <0) {
+        if (strlen(sprintf("%s", $coords)) < 0) {
             throw new \Exception("A miracle! A string with negative length!");
         };
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -373,7 +373,7 @@ 
      * @return string
      */
     public function bodyTagCode() {
-        return "onload='load(" . ($this->readOnly ? "0" : "1") . ")'";
+        return "onload='load(".($this->readOnly ? "0" : "1").")'";
     }
 
     /**
@@ -383,7 +383,7 @@ 
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/lib/admin/Wizard.php

Spacing +38 added lines, -38 removed lines

@@ -107,83 +107,83 @@ 
         foreach ($optionsList as $option) {
             $this->optionsHelp[$option] = $this->displayName($option, true);
         }
-        array_multisort(array_column($this->optionsHelp,'display'), SORT_ASC, $this->optionsHelp);
+        array_multisort(array_column($this->optionsHelp, 'display'), SORT_ASC, $this->optionsHelp);
     }
     
     public function setMessages() {
         // FED general
-        $h = "<p><h3>" . _("Here you set federation-level options.") . "</h3><p>";
-        $h .= "<i>" . _("The following options are available:") . "</i><p>";
+        $h = "<p><h3>"._("Here you set federation-level options.")."</h3><p>";
+        $h .= "<i>"._("The following options are available:")."</i><p>";
         $h .= "<dl>";
         foreach ($this->optionsHelp as $o) {
-            $h .= "<dt>". $o['display'] . "</dt>";
-            $h .= "<dd>" . $o['help'] . "</dd>";
+            $h .= "<dt>".$o['display']."</dt>";
+            $h .= "<dd>".$o['help']."</dd>";
         }
         $h .= "</dl>";
         $this->helpMessage['fed_general'] = $h;
         // SUPPORT
-        $h = "<p>" . _("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.") . "</p>";
+        $h = "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>";
         if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-            $h .= "<p>" .
-            sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $this->nomenclatureParticipant) . "</p>" .
-            "<p>" .
-            _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.") . "</p>";
+            $h .= "<p>".
+            sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $this->nomenclatureParticipant)."</p>".
+            "<p>".
+            _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.")."</p>";
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                $h .= "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), \config\ConfAssistant::SILVERBULLET['product_name']) . " " . _("This is the contact point for your organisation. It may be displayed publicly.") . "</p>";
+                $h .= "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), \config\ConfAssistant::SILVERBULLET['product_name'])." "._("This is the contact point for your organisation. It may be displayed publicly.")."</p>";
             }
         } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-            $h .= "<p>" . _("Providing at least a local support e-mail contact is required.") . " " . _("This is the contact point for your end users' level 1 support.") . "</p>";
+            $h .= "<p>"._("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
         }
         $this->helpMessage['support'] = $h;
 
         // MEDIA
-        $h = "<p>" .
-            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p><ul>";
+        $h = "<p>".
+            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p><ul>";
         $h .= "<li>";
-        $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+        $h .= "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>";
         if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
             $ssidlist = "";
             foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) {
-                $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+                $ssidlist .= ", '<strong>".$ssid."</strong>'";
             }
             $ssidlist = substr($ssidlist, 2);
              $h .= sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist);
-             $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
+             $h .= "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
         } else {
-             $h .=  _("Please configure which SSIDs should be configured in the installers.");
+             $h .= _("Please configure which SSIDs should be configured in the installers.");
         }
-         $h .= " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
+         $h .= " "._("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
          $h .= "</li>";
 
         $h .= "<li>";
-        $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+        $h .= "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>";
         if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) {
             $consortiumlist = "";
             foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) {
-                $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+                $consortiumlist .= ", '<strong>".$oi."</strong>'";
             }
             $consortiumlist = substr($consortiumlist, 2);
             $h .= sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'])), $consortiumlist);
 
-            $h .= "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $this->displayName("media:consortium_OI"));
+            $h .= "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $this->displayName("media:consortium_OI"));
         } else {
             $h .= _("Please configure which Consortium OIs should be configured in the installers.");
         }
         $h .= "</li>";
-        $h .= "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>"
-        . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") .
+        $h .= "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>"
+        . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).").
         "</li>";
-        $h .= "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
+        $h .= "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>"
         . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.")
         . "</li>";
         $h .= "</ul>";
         $this->helpMessage['media'] = $h;
         
         // IDP GENERAL
-        $h = "<p>" .
-        _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:") . "</p>".
+        $h = "<p>".
+        _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:")."</p>".
             "<ul>".
-                "<li>"._("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).") . "</li>".
+                "<li>"._("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).")."</li>".
                 "<li>".sprintf(_("<strong>%s</strong>: The organisation may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $this->displayName("general:instname"))."</li>".
                 "<li>".sprintf(_("<strong>%s</strong>: This acronym will be used as an element of the installer file name instead of one automatically created from first letters of every word in the institution name. You may add acronyms for multiple languages (but only one per language). The acronym will also be used as a keyword for the organisation search on the user's downloads page."), $this->displayName("general:instshortname"))."</li>".
                 "<li>".sprintf(_("<strong>%s</strong>: You may add several versions of the organisation name or acronyms which will be used as additional keywords exclusively for the organisation search on the user's downloads page."), $this->displayName("general:instaltname"))."</li>".
@@ -191,13 +191,13 @@ 
         $this->helpMessage['idp_general'] = $h;
         
         // PROFILE GENERAL
-        $h = "<p>" . _("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.") . "</p>".
-            "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>".
-            "<p>" . _("You can also tell us your RADIUS realm. ");
+        $h = "<p>"._("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.")."</p>".
+            "<p>"._("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.")."</p>".
+            "<p>"._("You can also tell us your RADIUS realm. ");
             if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
                $h .= sprintf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']);
             }
-        $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>";
+        $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).")."</p>";
         $this->helpMessage['profile'] = $h;
         
         // REALM
@@ -207,24 +207,24 @@ 
         $this->helpMessage['realm'] = $h;
         
         // REDIRECT
-         $h ="<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>";
+         $h = "<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).")."</p>";
         $this->helpMessage['redirect'] = $h;
         
         // EAP
-        $h = "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.") . "</p>";
+        $h = "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.")."</p>";
         $this->helpMessage['eap_support'] = $h;
         
         // LOCATIOM
-        $h = "<p>" .
-                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.") .
+        $h = "<p>".
+                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.").
                     "</p>
                      <ul>" .
                     _("<li>Drag the marker in the map to your place, or</li>
 <li>enter your street address in the field below for lookup, or</li>
-<li>use the 'Locate Me!' button</li>") .
+<li>use the 'Locate Me!' button</li>").
                     "</ul>
                      <strong>" .
-                    _("We will use the coordinates as indicated by the marker for geolocation.") .
+                    _("We will use the coordinates as indicated by the marker for geolocation.").
                     "</strong>";
         $this->helpMessage['location'] = $h;
     }

web/lib/admin/MapOpenLayers.php

Spacing +7 added lines, -7 removed lines

@@ -83,7 +83,7 @@ 
         
 // use HTML5 geolocation
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_success,locate_fail,{maximumAge:3600000, timeout:5000});
         }
         
@@ -205,7 +205,7 @@ 
                 view.fit(extent, {padding: [10, 0, 10, 0]});
             } else {
                 view.setCenter([0,0]);
-                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]['name'] . "'); // use the federation code to locate the country
+                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]['name']."'); // use the federation code to locate the country
                 map.setView(view);
             }
             view.setMaxZoom(20);
@@ -227,14 +227,14 @@ 
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             city = city.replace(/\s*,\s*/g,',+');
             city = city.replace(/ +/,'+');
             $.get(addressService+'?format=json&addressdetails=0&q='+city, '',  function(data) {
                 if (data[0] === undefined) {
-                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
+                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
                     return;
                 }
                 showTmpPointer(data[0].lon, data[0].lat);
@@ -285,7 +285,7 @@ 
         if ($this->readOnly) {
             return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -310,7 +310,7 @@ 
         // we don't need this parameter in this subclass
         unset($coords);
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -322,7 +322,7 @@ 
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/skins/modern/accountstatus/accountstatus.php

Spacing +27 added lines, -27 removed lines

@@ -47,9 +47,9 @@ 
 $Gui->loggerInstance->debug(4, $operatingSystem);
 $uiElements = new web\lib\admin\UIElements();
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
-require dirname(__DIR__) . '/user/js/cat_js.php';
+require dirname(__DIR__).'/user/js/cat_js.php';
 ?>
     var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
 </script>
@@ -79,7 +79,7 @@ 
                         <?php
                         switch ($statusInfo['errorcode']) {
                             case "GENERATOR_CONSUMED":
-                                echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to reuse download link"), TRUE) . "<p>";
+                                echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to reuse download link"), TRUE)."<p>";
                                 break;
                             case NULL:
                             default:
@@ -102,7 +102,7 @@ 
                                     echo " ";
                                     echo sprintf(ngettext("<strong>%d</strong> of your credentials is not valid any more.", "<strong>%d</strong> of your credentials are not valid any more.", $noGoodCerts), $noGoodCerts);
                                 }
-                                echo " <span id='detailtext'>" . _("I want to see the details.") . "</span>";
+                                echo " <span id='detailtext'>"._("I want to see the details.")."</span>";
                                 echo "<table id='cert_details'></table>";
                             }
                         }
@@ -111,60 +111,60 @@ 
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_VALID: // treat both cases as equal
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED:
                                 if ($statusInfo['invitation_object']->activationsTotal > 1) { // only show this extra info in the non-trivial case.
-                                    echo "<h3>" . sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['invitation_object']->activationsRemaining, $statusInfo['invitation_object']->activationsTotal - $statusInfo['invitation_object']->activationsRemaining) . "</h3>";
+                                    echo "<h3>".sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['invitation_object']->activationsRemaining, $statusInfo['invitation_object']->activationsTotal - $statusInfo['invitation_object']->activationsRemaining)."</h3>";
                                 }
                                 if (!$statusInfo["OS"]) {
-                                    echo "<p>" . _("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
+                                    echo "<p>"._("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.")."</p>";
                                     break;
                                 }
 
                                 $dev = new \core\DeviceFactory($statusInfo['OS']['device']);
                                 $dev->device->calculatePreferredEapType([new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET)]);
                                 if ($dev->device->selectedEap == []) {
-                                    echo "<p>" . sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
+                                    echo "<p>".sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display'])."</p>";
                                     break;
                                 }
-                                $message = $dev->device->options['message'] ?? '' ;
+                                $message = $dev->device->options['message'] ?? '';
 
                                 $sbMessage = $dev->device->options['sb_message'] ?? '';
                                 if ($message != '' && $sbMessage != '') {
-                                    $message = $message . "<p>" . $sbMessage;
+                                    $message = $message."<p>".$sbMessage;
                                 } else {
-                                    $message = $message . $sbMessage;
+                                    $message = $message.$sbMessage;
                                 }
                          
-                                echo "<div id='sb_download_message'><p>" . sprintf(_("You can now download a personalised  %s installation program."), \config\ConfAssistant::CONSORTIUM['display_name']);
+                                echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised  %s installation program."), \config\ConfAssistant::CONSORTIUM['display_name']);
 //                       echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
                                 echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
-                                echo "<p style='color:red;'>" . sprintf(_("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local %s administrator."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";
-                                echo "<p>" . _("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.") . "</p></div>";
+                                echo "<p style='color:red;'>".sprintf(_("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local %s administrator."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";
+                                echo "<p>"._("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.")."</p></div>";
 
                                 $importPassword = \core\common\Entity::randomString(4, "0123456789");
                                 $profile = new \core\ProfileSilverbullet($statusInfo['profile']->identifier, NULL);
                                 
-                                echo "<h2>" . sprintf(_("Import PIN: %s"), $importPassword) . "</h2>";
+                                echo "<h2>".sprintf(_("Import PIN: %s"), $importPassword)."</h2>";
                                 $_SESSION['individualtoken'] = $cleanToken;
                                 $_SESSION['importpassword'] = $importPassword;
-                                echo "<input type='hidden' name='device' value='" . $statusInfo['OS']['device'] . "'/>";
+                                echo "<input type='hidden' name='device' value='".$statusInfo['OS']['device']."'/>";
                                 echo "<input type='hidden' name='generatedfor' value='silverbullet'/>";
-                                echo "<button class='large_button' id='user_button_sb' style='height:80px;'><span id='user_buttonnnn'>" . sprintf(_("Click here to download your %s installer!"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</span></button>";
+                                echo "<button class='large_button' id='user_button_sb' style='height:80px;'><span id='user_buttonnnn'>".sprintf(_("Click here to download your %s installer!"), \config\ConfAssistant::CONSORTIUM['display_name'])."</span></button>";
                                 echo "<div class='device_info' id='info_g_sb'></div>";
                                 break;
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_EXPIRED:
                                 echo "<h2>Invitation link expired</h2>";
-                                echo "<p>" . sprintf(_("Unfortunately, the invitation link you just used is too old. The %s sign-up invitation was valid until %s. You cannot use this link any more. Please ask your administrator to issue you a new invitation link."), \config\ConfAssistant::CONSORTIUM['display_name'], $statusInfo['invitation_object']->expiry) . "</p>";
+                                echo "<p>".sprintf(_("Unfortunately, the invitation link you just used is too old. The %s sign-up invitation was valid until %s. You cannot use this link any more. Please ask your administrator to issue you a new invitation link."), \config\ConfAssistant::CONSORTIUM['display_name'], $statusInfo['invitation_object']->expiry)."</p>";
                                 echo "<p>Below is all the information about your account's other login details, if any.</p>";
 // do NOT break, display full account info instead (this was a previously valid token after all)
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_REDEEMED:
                                 // nothing to say really. User got the breakdown of certs above, and this link doesn't give him any new ones.
                                 break;
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID:
-                                echo "<h2>" . _("Account information not found") . "</h2>";
-                                echo "<p>" . sprintf(_("The invitation link you followed does not map to any invitation we have on file.") . "</p><p>" . _("You should use the exact link you got during sign-up to come here. Alternatively, if you have a valid %s credential already, you can visit this page and Accept the question about logging in with a client certificate (select a certificate with a name ending in '…%s')."),\config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::SILVERBULLET['realm_suffix']);
+                                echo "<h2>"._("Account information not found")."</h2>";
+                                echo "<p>".sprintf(_("The invitation link you followed does not map to any invitation we have on file.")."</p><p>"._("You should use the exact link you got during sign-up to come here. Alternatively, if you have a valid %s credential already, you can visit this page and Accept the question about logging in with a client certificate (select a certificate with a name ending in '…%s')."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::SILVERBULLET['realm_suffix']);
                         }
                         if (isset($statusInfo['profile_id']) && isset($statusInfo['idp_id'])) {
-                            echo "<input type='hidden' name='profile' id='profile_id' value='" . $statusInfo['profile_id'] . "'/>";
-                            echo "<input type='hidden' id='inst_id' name='idp' value='" . $statusInfo['idp_id'] . "'/>";
+                            echo "<input type='hidden' name='profile' id='profile_id' value='".$statusInfo['profile_id']."'/>";
+                            echo "<input type='hidden' id='inst_id' name='idp' value='".$statusInfo['idp_id']."'/>";
                         }
                         ?>
                     </div>
@@ -184,18 +184,18 @@ 
     $attributes = $statusInfo['attributes'];
     $supportInfo = '';
     if (!empty($attributes['local_url'])) {
-        $supportInfo .= '<tr><td>' . ("WWW:") . '</td><td><a href="' . $attributes['local_url'] . '" target="_blank">' . $attributes['local_url'] . '</a></td></tr>';
+        $supportInfo .= '<tr><td>'.("WWW:").'</td><td><a href="'.$attributes['local_url'].'" target="_blank">'.$attributes['local_url'].'</a></td></tr>';
     }
     if (!empty($attributes['local_email'])) {
-        $supportInfo .= '<tr><td>' . ("email:") . '</td><td><a href="' . $attributes['local_email'] . '" target="_blank">' . $attributes['local_email'] . '</a></td></tr>';
+        $supportInfo .= '<tr><td>'.("email:").'</td><td><a href="'.$attributes['local_email'].'" target="_blank">'.$attributes['local_email'].'</a></td></tr>';
     }
     if (!empty($attributes['local_phone'])) {
-        $supportInfo .= '<tr><td>' . ("tel:") . '</td><td><a href="' . $attributes['local_phone'] . '" target="_blank">' . $attributes['local_phone'] . '</a></td></tr>';
+        $supportInfo .= '<tr><td>'.("tel:").'</td><td><a href="'.$attributes['local_phone'].'" target="_blank">'.$attributes['local_phone'].'</a></td></tr>';
     }
     if ($supportInfo != '') {
-        $supportInfo = "<table><tr><th colspan='2'>" . _("If you encounter problems, then you can obtain direct assistance from your organisation at:") . "</th></tr>$supportInfo</table>";
+        $supportInfo = "<table><tr><th colspan='2'>"._("If you encounter problems, then you can obtain direct assistance from your organisation at:")."</th></tr>$supportInfo</table>";
     } else {
-        $supportInfo = "<table><tr><th colspan='2'>" . _("If you encounter problems you should ask those who gave you your account for help.") . "</th></tr></table>";
+        $supportInfo = "<table><tr><th colspan='2'>"._("If you encounter problems you should ask those who gave you your account for help.")."</th></tr></table>";
     }
     ?>
     <script>
@@ -204,7 +204,7 @@ 
             var logo = <?php echo $statusInfo['idp_logo']; ?>;
             var idpId = <?php echo $statusInfo['idp_id']; ?>;
             <?php
-                if($message != '') {
+                if ($message != '') {
                     echo "message = \"$message\";\n";
                 }
             ?>