GEANT / CAT

web/skins/modern/user/js/cat_js.php

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
         otherdata = j.otherdata;
     if(! result) {
       alert("<?php escaped_echo(_("no matching data found"))?>");
-      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/' ?>';
+      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/' ?>';
     }
     j = j.data;
     n = j.length;
@@ -224,7 +224,7 @@ 
        result = j1.status;
        if(! result) {
             alert("<?php escaped_echo(_("no matching data found")) ?>");
-            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/' ?>';
+            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/' ?>';
        }
        j = j1.data;
        if(j.description !== undefined && j.description) {

web/skins/modern/user/cat_info.php

Spacing +18 added lines, -18 removed lines

@@ -30,7 +30,7 @@ 
  * the receiving end to strip this marker and not add the title by itself.
  *
  */
-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 
@@ -40,46 +40,46 @@ 
 $subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about' :
-        require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
+        require_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
         $out = "<div class='padding'>$out</div>";
         break;
     case 'tou':
-        require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
+        require_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
         $out = "no_title<div>
            <h1>
-         " . $Tou['title'] . "
+         " . $Tou['title']."
     </h1>
-<div id='tou_1'>" . $Tou['subtitle'] . 
-$Tou['short'] . "
+<div id='tou_1'>" . $Tou['subtitle']. 
+$Tou['short']."
 </div>
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
 <div id='tou_2' style='display:none; padding-top:20px'>" .
-$Tou['full'] . "
+$Tou['full']."
 </div>
 </div>
 ";
         break;
     case 'help':
-        require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
+        require_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
         switch ($subpage) {
             case 'contact' :
             case 'idp_not_listed' :
             case 'device_not_listed' :
             case 'what_is_eduroam' :
-                $out = "no_title<div><h1>" . _("Help") . "</h1>";
+                $out = "no_title<div><h1>"._("Help")."</h1>";
                 foreach ($Faq as $faqItem) {
                     if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
-                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                        $out .= "" . $faqItem['text'] . "</div>\n";
+                        $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                        $out .= "".$faqItem['text']."</div>\n";
                     }
                 }
                 $out .= "</div>";
                 break;
             case 'faq':
-                $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
+                $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
                 foreach ($Faq as $faqItem) {
-                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                    $out .= "" . $faqItem['text'] . "</div>\n";
+                    $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                    $out .= "".$faqItem['text']."</div>\n";
                 }
                 $out .= "</div>";
                 break;
@@ -103,15 +103,15 @@ 
                     $rn = uniqid();
                     $_SESSION['remindIdP'] = $rn;
                     $out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
-                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
-                    $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
-                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
+                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
+                    $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
+                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
                     $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
                     $out = "<div  class='padding'>$out</div>";
                     }
                 break;
             case 'develop' :
-                        require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
+                        require_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
                         $out = "<div class='padding'>$out</div>";
                 break;
         }

web/skins/modern/Menu.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * Menu class helps to define the menu on the main page
@@ -39,9 +39,9 @@ 
         $langsArray = [];
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
             if ($lang == $selectedLang) {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
             } else {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
             }
         }
         $this->menu = [['id' => 'start',
@@ -92,13 +92,13 @@ 
                 $iD = $menuItem['id'] ?? $id;
                 $catInfo = NULL;
                 if (!empty($menuItem['catInfo'])) {
-                    $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")';
+                    $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")';
                 }
                 if (!empty($menuItem['link']) && substr($menuItem['link'], 0, 1) === '/') {
-                    $menuItem['link'] = \core\CAT::getRootUrlPath() . $menuItem['link'];
+                    $menuItem['link'] = \core\CAT::getRootUrlPath().$menuItem['link'];
                 }
                 $link = $catInfo ?? $menuItem['link'] ?? '';
-                $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"';
+                $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"';
                 $submenu = $menuItem['submenu'] ?? [];
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
                 $out .= $this->printMenu($submenu, $iD);
@@ -114,7 +114,7 @@ 
         if ($itemLink === '') {
             return("<li><span>$itemText</span>");
         }
-        return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>";
+        return "<li><a href='".$itemLink."'".$itemClass.'>'.$itemText."</a>";
     }
     
     public function printMinimalMenu() {

web/skins/modern/Divs.php

Spacing +31 added lines, -31 removed lines

@@ -52,7 +52,7 @@ 
             <span>Configuration Assistant Tool</span>
             </div>";
         }
-        $retval .= "<div id='motd'>" . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . "</div>";
+        $retval .= "<div id='motd'>".(isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp')."</div>";
         $loc2 = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png");
         if ($loc2 !== FALSE) {
             $retval .= "<img id='hamburger' src='$loc2' alt='Menu'/>";
@@ -70,13 +70,13 @@ 
     public function div_user_welcome() {
         $retval = "
 <div id='user_welcome'> <!-- this information is shown just before the download -->
-    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING] . "</strong>
+    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING]."</strong>
     <p>
     <span id='download_info'>
     <!-- the empty href is dynamically exchanged with the actual path by jQuery at runtime -->
-        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD] . "
+        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD]."
     </span>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING] . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING]."
     <br/>
     <br/>";
         switch (CONFIG_CONFASSISTANT['CONSORTIUM']['name']) {
@@ -86,11 +86,11 @@ 
         }
         $retval .= "
     </p>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE] . "
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS] . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE]."
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS]."
     </p>
     <p>
-    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS] . "</strong></a>
+    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS]."</strong></a>
     </p>
 </div> <!-- id='user_welcomer_page' -->
 ";
@@ -100,7 +100,7 @@ 
     public function div_silverbullet() {
         $retval = "
 <div id='silverbullet'>"
-    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] . 
+    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY]. 
     "</div>
     ";
         return $retval;
@@ -109,10 +109,10 @@ 
     public function div_top_welcome() {
         return "
 <div id='welcome_top1'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET] . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET]."
 </div>
 <div id='top_invite'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE] . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE]."
 </div>";
     }
 
@@ -120,7 +120,7 @@ 
         $retval = "
 <div id='roller'>
     <div id='slides'>
-        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY] . "</span>
+        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY]."</span>
         <span id='line2'></span>
         <span id='line3'></span>
         <span id='line4'>";
@@ -173,9 +173,9 @@ 
     public function div_profiles() {
         return "
 <div id='profiles'> <!-- this is the profile selection filled during run time -->
-    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
+    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
     </div>" .
-"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
+"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
                 "</div>";
     }
 
@@ -190,7 +190,7 @@ 
     public function div_institution($selectButton = TRUE) {
         $retval = "<div id='institution_name'>
     <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
-                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
+                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
                 "</div>";
         $retval .= $this->emptyImage('idp_logo', 'IdP Logo');
         return $retval;
@@ -204,7 +204,7 @@ 
     public function div_otherinstallers() {
         $retval = "
 <div class='sub_h'>
-    <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
+    <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
          <table id='device_list' style='padding:0px;'>";
 
         foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
@@ -212,18 +212,18 @@ 
             $deviceIndex = 0;
 
             $imgTag = "";
-            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
+            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
             if ($imgLocation !== FALSE) {
-                $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
+                $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
             }
-            $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
+            $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
             foreach ($deviceGroup as $d => $D) {
                 if ($deviceIndex) {
                     $retval .= '<tr>';
                 }
-                $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
-                        . "<div class='device_info' id='info_" . $d . "'></div></td>"
-                        . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
+                $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
+                        . "<div class='device_info' id='info_".$d."'></div></td>"
+                        . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
                 $deviceIndex++;
             }
             $retval .= "</tbody>";
@@ -237,15 +237,15 @@ 
     }
 
     public function div_guess_os($operatingSystem) {
-        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
+        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
         $vendorstyle = "";
         if ($vendorlogo !== FALSE) {
-            $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
+            $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
         }
         $deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
         $deleteImg = "";
         if ($deleteIcon !== FALSE) {
-            $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
+            $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
         }
         return "
 <div class='sub_h' id='guess_os'>
@@ -253,23 +253,23 @@ 
     <table id='browser'>
         <tr>
             <td>
-                <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
+                <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
                     $deleteImg
-                    <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
+                    <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
                     </div>
                     <div class='download_button_text'>" .
-                $operatingSystem['display'] . "
+                $operatingSystem['display']."
                     </div>
                 </button>
-                <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
+                <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
           </td>
           <td style='vertical-align:top'>
-               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
+               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
           </td>
       </tr>
     </table> <!-- id='browser' -->
     <div class='sub_h'>
-       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
+       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
     </div>
 </div> <!-- id='guess_os' -->";
     }
@@ -285,7 +285,7 @@ 
             </td>";
             
         if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
-            $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</a></td>";
+            $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</a></td>";
         }
         $retval .= "<td>";
         if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam" && isset(CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo']) && CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo'] == "Operations Team") {

web/skins/modern/accountstatus/accountstatus.php

Spacing +28 added lines, -28 removed lines

@@ -33,7 +33,7 @@ 
     var sbPage = 1;
 <?php
 $profile_list_size = 1;
-require_once dirname(__DIR__) . '/Divs.php';
+require_once dirname(__DIR__).'/Divs.php';
 $divs = new Divs($Gui);
 
 $visibility = 'sb';
@@ -44,9 +44,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->langObject->getLang()) ?>";
 </script>
@@ -76,7 +76,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 re-use 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 re-use download link"), TRUE)."<p>";
                                 break;
                             case NULL:
                             default:
@@ -99,7 +99,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>";
                             }
                         }
@@ -108,60 +108,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 invititation 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 invititation 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>
@@ -181,18 +181,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>
@@ -201,7 +201,7 @@ 
             var logo = <?php echo $statusInfo['idp_logo']; ?>;
             var idpId = <?php echo $statusInfo['idp_id']; ?>;
             <?php
-                if($message != '') {
+                if ($message != '') {
                     echo "message = \"$message\";\n";
                 }
             ?>

web/skins/modern/copyright.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             <div id="user_page" style="display:block">
                 <?php echo $divs->div_pagetitle("eduroam CAT Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>

web/skins/modern/index.php

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@ 
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
 
-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
 if (preg_match('/Android/', $userAgent)) {
@@ -75,7 +75,7 @@ 
     <?php echo $divs->div_heading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>

web/skins/example/accountstatus.php

Spacing +5 added lines, -5 removed lines

@@ -16,12 +16,12 @@
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */?>
-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
 <pre>
-    <?php print_r($statusInfo);?>
+    <?php print_r($statusInfo); ?>
 </pre>

web/tou.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
  * @package UserGUI
  * 
  */
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $loggerInstance = new \core\common\Logging();
 $langObject = new \core\common\Language();
 $cat = new \core\CAT();
@@ -51,9 +51,9 @@ 
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
 
-        <div id="motd"><?php print ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
+        <div id="motd"><?php print (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
 
-        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
+        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
         <div id="tou">
             <?php
             require "user/tou.php";
@@ -67,7 +67,7 @@ 
                     </td>
                     <?php
                     if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
-                        $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),CONFIG_CONFASSISTANT['CONSORTIUM']['name']) . "</a></td>";
+                        $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['name'])."</a></td>";
                     }
                     ?>
                     <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>