GEANT / CAT

web/admin/inc/common.inc.php

Spacing +2 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
 
     $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
     $details['name'] = preg_replace('/\//', "", $details['name']);
-    $certstatus = ( $details['root'] == 1 ? "R" : "I");
+    $certstatus = ($details['root'] == 1 ? "R" : "I");
     if ($details['ca'] == 0 && $details['root'] != 1) {
         return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
     }
@@ -339,7 +339,7 @@ 
                     }
                     break;
                 case "boolean":
-                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                     break;
                 default:
                     $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";

web/resources/inc/header.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
                     <select id='lang' name='lang' onchange='this.form.submit()'>
                         <?php
                         foreach (Config::$LANGUAGES as $lang => $value) {
-                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
                         }
                         ?>
                     </select>

devices/ms/Files/geant_link.inc

Spacing +2 added lines, -2 removed lines

@@ -69,14 +69,14 @@
   File "GEANTLink64.msi"

   nsArray::Set Delete_files "GEANTLink64.msi"

   DetailPrint "Install GEANTLink installer"

-  MessageBox MB_OK  "<?php echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"

+  MessageBox MB_OK  "<?php echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"

   !insertmacro debug_cat 1 "Run GEANTLink installer"

   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink$Platform.msi"'

   ClearErrors

   ExecWait '$Msiexec.exe /i "$TEMP\GEANTLink$Platform.msi" /qb' $0

   !insertmacro debug_cat 4 "GEANTLink returned $0"

   StrCmp $0 0 Cont2

-  MessageBox MB_OK "<?php echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"

+  MessageBox MB_OK "<?php echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"

   Quit

   Cont2:

 FunctionEnd

web/admin/action_fedcheck.php

Braces +26 added lines, -17 removed lines

@@ -44,10 +44,11 @@ 
     // NAPTR existence check
     $tabletext .= "<td>";
     $naptr = $testsuite->NAPTR();
-    if ($naptr != RETVAL_NOTCONFIGURED)
-        switch ($naptr) {
+    if ($naptr != RETVAL_NOTCONFIGURED) {
+            switch ($naptr) {
             case RETVAL_NONAPTR:
                 $tabletext .= _("No NAPTR records");
+    }
                 break;
             case RETVAL_ONLYUNRELATEDNAPTR:
                 $tabletext .= sprintf(_("No associated NAPTR records"));
@@ -73,8 +74,9 @@ 
                 }
                 if ($srv > 0) {
                     $hosts = $testsuite->NAPTR_hostnames();
-                    if ($hosts == RETVAL_INVALID)
-                        $NAPTR_issues = true;
+                    if ($hosts == RETVAL_INVALID) {
+                                            $NAPTR_issues = true;
+                    }
                 }
                 break;
         }
@@ -91,14 +93,17 @@ 
     foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
         $testsuite->UDP_reachability($hostindex, true, true);
         $results = $testsuite->UDP_reachability_result[$hostindex];
-        if ($results['packetflow_sane'] != TRUE)
-            $UDPErrors = true;
-        if (empty($results['packetflow'][11]))
-            $UDPErrors = true;
+        if ($results['packetflow_sane'] != TRUE) {
+                    $UDPErrors = true;
+        }
+        if (empty($results['packetflow'][11])) {
+                    $UDPErrors = true;
+        }
         if (count($results['cert_oddities']) > 0) {
-            foreach ($results['cert_oddities'] as $oddity)
-                if ($oddity['level'] > $certBiggestOddity)
+            foreach ($results['cert_oddities'] as $oddity) {
+                            if ($oddity['level'] > $certBiggestOddity)
                     $certBiggestOddity = $oddity['level'];
+            }
         }
     }
 
@@ -119,8 +124,9 @@ 
     if ($naptr > 0 && count($testsuite->NAPTR_hostname_records) > 0) {
         foreach ($testsuite->NAPTR_hostname_records as $hostindex => $addr) {
             $retval = $testsuite->TLS_clients_side_check($addr);
-            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED)
-                $dynamicErrors = true;
+            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED) {
+                            $dynamicErrors = true;
+            }
         }
     }
     if (!$dynamicErrors) {
@@ -162,10 +168,11 @@ 
 $profiles_showtime = [];
 $profiles_readyconf = [];
 
-foreach ($allIDPs as $index => $oneidp)
+foreach ($allIDPs as $index => $oneidp) {
     foreach ($oneidp['instance']->listProfiles() as $profile)
         if ($profile->isShowtime()) {
             $profiles_showtime[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
+}
         } else if ($profile->readyForShowtime()) {
             $profiles_confready[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
         }
@@ -173,16 +180,18 @@ 
 if (count($profiles_showtime) > 0) {
     echo "<h2>" . _("Profiles marked as visible (V)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_showtime as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_showtime as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 
 if (count($profiles_confready) > 0) {
     echo "<h2>" . _("Profiles with sufficient configuration, not marked as visible (C)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_confready as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_confready as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 ?>

web/admin/radius_tests.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 function disp_name($eap) {
     $displayName = EAP::eapDisplayName($eap);
-    return $displayName['OUTER'] . ( $displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
+    return $displayName['OUTER'] . ($displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
 }
 
 function printDN($distinguishedName) {

core/UserManagement.php

Spacing +2 added lines, -2 removed lines

@@ -259,8 +259,8 @@
         $retval = [];
         $invitations = $this->databaseHandle->exec("SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token 
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
-        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation" ) . ".\n");
+                                        WHERE cat_institution_id " . ($idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation") . ".\n");
         while ($invitationQuery = mysqli_fetch_object($invitations)) {
             $retval[] = ["country" => $invitationQuery->country, "name" => $invitationQuery->name, "mail" => $invitationQuery->invite_dest_mail, "token" => $invitationQuery->invite_token];
         }

devices/ms/Files/common.inc

Spacing +29 added lines, -29 removed lines

@@ -112,10 +112,10 @@ 
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
-!define WELCOME_HEADER "<?php printf(sprint_nsi(_("Welcome to the %s installer")),CONFIG['CONSORTIUM']['name'])?>"
-!define FAREWELL_HEADER "<?php echo_nsi( _("Installation complete"))?>"
-!define FAREWELL_TEXT	"<?php echo_nsi( _("Network profiles have been installed."))?>$\r$\n$\n <?php echo_nsi(  _("Your system is ready."))?>"
-!define FAREWELL_FAIL	"<?php echo_nsi( _("Network installation had errors."))?>$\r$\n$\n <?php echo_nsi( _("Please contact \${SUPPORT}."))?>"
+!define WELCOME_HEADER "<?php printf(sprint_nsi(_("Welcome to the %s installer")), CONFIG['CONSORTIUM']['name'])?>"
+!define FAREWELL_HEADER "<?php echo_nsi(_("Installation complete"))?>"
+!define FAREWELL_TEXT	"<?php echo_nsi(_("Network profiles have been installed."))?>$\r$\n$\n <?php echo_nsi(_("Your system is ready."))?>"
+!define FAREWELL_FAIL	"<?php echo_nsi(_("Network installation had errors."))?>$\r$\n$\n <?php echo_nsi(_("Please contact \${SUPPORT}."))?>"
 ;--------------------------------
 ;Languages
 !insertmacro MUI_LANGUAGE "${LANG}"
@@ -123,14 +123,14 @@ 
 ;--------------------------------
 ; License file
 !ifdef LICENSE_FILE
-LicenseForceSelection checkbox "<?php echo_nsi( _("Accept"))?>"
+LicenseForceSelection checkbox "<?php echo_nsi(_("Accept"))?>"
 LicenseText "<?php echo_nsi(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
 LicenseData ${LICENSE_FILE}
 !endif
 
 ;-----------------------------------
 
-MiscButtonText "" "" "" "<?php echo_nsi( _("Finish"))?>"
+MiscButtonText "" "" "" "<?php echo_nsi(_("Finish"))?>"
 ;----------------------------------
 ;  FUNCTIONS
 
@@ -163,7 +163,7 @@ 
 
 !macro install_ca_cert ca_file ca_fingerprint level
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
-   DetailPrint "<?php echo_nsi( _("searching for certificate"))?> ${ca_file}"
+   DetailPrint "<?php echo_nsi(_("searching for certificate"))?> ${ca_file}"
    File "${ca_file}"
    nsArray::Set Delete_files "${ca_file}"
    !insertmacro debug_cat 2 "Testing machine store root"
@@ -225,13 +225,13 @@ 
    ${EndIf}
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
-   DetailPrint "<?php echo_nsi( _("installing certificate"))?> ${ca_file}"
+   DetailPrint "<?php echo_nsi(_("installing certificate"))?> ${ca_file}"
    nsExec::Exec '"certutil" -addstore -user ${level} $TEMP\${ca_file}'
    Pop $0
    !insertmacro debug_cat 3 "certutil returned $0"
    ${If} $0 != 0
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi( _("could not install certificate"))?>  ${ca_file}"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi(_("could not install certificate"))?>  ${ca_file}"
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
    ${EndIf}
 no_install_${ca_file}:
@@ -420,26 +420,26 @@ 
   pop $R0
   ${If} $tkip_count > 0
     ${If} $aes_count > 1
-      StrCpy $R1 "$\r$\n$\n<?php echo_nsi( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
+      StrCpy $R1 "$\r$\n$\n<?php echo_nsi(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
     ${Else}
-     StrCpy $R1 "$\r$\n$\n<?php echo_nsi( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
+     StrCpy $R1 "$\r$\n$\n<?php echo_nsi(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
     ${EndIf}
   ${Else}
     StrCpy $R1 ""
   ${EndIf}
   ${If} $profile_count > 0
-    StrCpy $welcome_message "<?php echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php echo_nsi( _("The installer will create the following wireless profiles:"))?>$\r$\n\
+    StrCpy $welcome_message "<?php echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php echo_nsi(_("The installer will create the following wireless profiles:"))?>$\r$\n\
 $R0.\
 $R1$\r$\n$\n\
-<?php echo_nsi( _("More information and comments:"))?>$\r$\n\
+<?php echo_nsi(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${Else}
-StrCpy $welcome_message "<?php echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php echo_nsi( _("The installer will create the wireless profile:"))?> $R0.\
+StrCpy $welcome_message "<?php echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php echo_nsi(_("The installer will create the wireless profile:"))?> $R0.\
 $R1$\r$\n$\n\
-<?php echo_nsi( _("More information and comments:"))?>$\r$\n\
+<?php echo_nsi(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${EndIf}
@@ -465,7 +465,7 @@ 
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
 ;TRANSLATION
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
-$\r$\n$\r$\n<?php echo_nsi( _("Installer created with software from the GEANT project."))?>"
+$\r$\n$\r$\n<?php echo_nsi(_("Installer created with software from the GEANT project."))?>"
   Pop $TEXT
 
   SetCtlColors $DIALOG "" 0xffffff
@@ -576,18 +576,18 @@ 
     ${If} $wireless_result == 1
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
     ${If} $wireless_result == 2
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi( _("No wireless interfaces found. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi(_("No wireless interfaces found. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
   ${Else}
     ${If} $wireless_result > 0
        IfSilent +3
-       MessageBox MB_YESNO "<?php echo_nsi( _("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
+       MessageBox MB_YESNO "<?php echo_nsi(_("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
        Call Cleanup
        wired_yes:
        Push 1
@@ -603,7 +603,7 @@ 
     ${If} $wired == 1
       ${If} $force_wired == 0
         IfSilent wired
-        MessageBox MB_YESNO "<?php echo_nsi( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
+        MessageBox MB_YESNO "<?php echo_nsi(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
         Push 0
         Pop $wired
       ${EndIf}
@@ -638,7 +638,7 @@ 
 ;================================
 
 Function ShowInstfiles
-  !insertmacro MUI_HEADER_TEXT "<?php echo_nsi( _("Profiles installation"))?>" " "
+  !insertmacro MUI_HEADER_TEXT "<?php echo_nsi(_("Profiles installation"))?>" " "
 FunctionEnd
 ;================================
 ;  Check if a wireless profile exist and put it on delete list
@@ -657,7 +657,7 @@ 
 
 Function FindProfile
   Pop $R8
-  DetailPrint "<?php echo_nsi( _("Checking for profile \$R8"))?>"
+  DetailPrint "<?php echo_nsi(_("Checking for profile \$R8"))?>"
   !insertmacro debug_cat 2 "Checking for profile $R8"
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
@@ -665,7 +665,7 @@ 
   !insertmacro debug_cat 4 "netsh returned $0"
   ${If} $0 == 0
     !insertmacro debug_cat 1 "found profile $R8"
-    DetailPrint "<?php echo_nsi( _("found profile \$R8"))?>"
+    DetailPrint "<?php echo_nsi(_("found profile \$R8"))?>"
     Push 0
   ${Else}
     !insertmacro debug_cat 1 "profile $R8 not found"
@@ -757,7 +757,7 @@ 
     ${If} $Symantec_installed  != 0
      !insertmacro debug_cat 3 "Symantec problem"
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")),CONFIG['CONSORTIUM']['name']) ?>"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")), CONFIG['CONSORTIUM']['name']) ?>"
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
     Quit
 
@@ -944,7 +944,7 @@ 
 !ifdef TLS
 Function PFXCertificateSelect
 ;TRANSLATION
-!insertmacro MUI_HEADER_TEXT "<?php printf(sprint_nsi(_("%s installer for")),CONFIG['CONSORTIUM']['name'])?> " "<?php echo_nsi(_("Install personal certificate"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php printf(sprint_nsi(_("%s installer for")), CONFIG['CONSORTIUM']['name'])?> " "<?php echo_nsi(_("Install personal certificate"))?>"
   ${If} $PFX_install == 0
     Return
   ${EndIf}
@@ -1112,7 +1112,7 @@ 
 PageEx components
 PageCallbacks showComponents "" ""
 ;TRANSLATION
-ComponentText "<?php printf(sprint_nsi(_("In order to install/update %s access all selected steps need to be performed. Click Continue to proceed")),CONFIG['CONSORTIUM']['name'])?>" "" \
+ComponentText "<?php printf(sprint_nsi(_("In order to install/update %s access all selected steps need to be performed. Click Continue to proceed")), CONFIG['CONSORTIUM']['name'])?>" "" \
       "<?php echo_nsi(_("If an option is not selected by default, then it is either not available or optional."))?>"
 PageExEnd
 ;=============================
@@ -1132,7 +1132,7 @@ 
 Section "-start"
 SectionIn RO
 
-!insertmacro MUI_HEADER_TEXT "<?php echo_nsi( _("Installation"))?>" "<?php echo_nsi( _("Checking for existing wireless profiles"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php echo_nsi(_("Installation"))?>" "<?php echo_nsi(_("Checking for existing wireless profiles"))?>"
 !ifndef PWD
 !include "certs.nsh"
 !endif

web/user/faq.php

Indentation +21 added lines, -21 removed lines

@@ -2,63 +2,63 @@ 
 $FAQ = [];
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("My institution is not listed. Can't I just use any of the other ones?")),
         'text'=>sprintf(_("No! The installers contain security settings which are specific to the institution. If you are not from that institution, your computer will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using a different institution installer is <i>guaranteed to not work</i>!"))
-         ]);
+            ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("What can I do to get my institution listed?")),
         'text'=>sprintf(_("Contact %s administrators at your home institution and complain. It will take at most one hour of their time to get things done."),CONFIG['CONSORTIUM']['name'])
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"),CONFIG['CONSORTIUM']['name']),
         'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."),CONFIG['CONSORTIUM']['name'],CONFIG['CONSORTIUM']['name'])
-      ]);
+        ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"),CONFIG['CONSORTIUM']['name']),
         'text'=>sprintf(_("When you are connecting from an unconfigured device your security is at risk. The very point of preconfiguration is to set up security, when this is done, your device will first confirm that it talks to the correct authentication server and will never send your password to an untrusted one."))
 ]);
 
 if (CONFIG['CONSORTIUM']['name'] == "eduroam") {
-   array_push($FAQ,
-         [
-           'title'=>sprintf(_("What is this eduroam thing anyway?")),
-           'text'=>sprintf(_("eduroam is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all eduroam hotspots on the planet. There are several million eduroam users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the eduroam homepage</a> for more details."))
-         ]);
+    array_push($FAQ,
+            [
+            'title'=>sprintf(_("What is this eduroam thing anyway?")),
+            'text'=>sprintf(_("eduroam is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all eduroam hotspots on the planet. There are several million eduroam users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the eduroam homepage</a> for more details."))
+            ]);
 }
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("Is it safe to use %s installers?"),CONFIG['APPEARANCE']['productname']),
         'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."),CONFIG['APPEARANCE']['productname']).' '.( isset(CONFIG['CONSORTIUM']['signer_name']) && CONFIG['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."),CONFIG['APPEARANCE']['productname'],CONFIG['CONSORTIUM']['signer_name']):""),
         
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>_("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
         'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(CONFIG['CONSORTIUM']['signer_name']) && CONFIG['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."),CONFIG['CONSORTIUM']['signer_name'])." ":"").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."),"<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
         
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"),CONFIG['CONSORTIUM']['name']),
-      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."),CONFIG['CONSORTIUM'][
+        'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."),CONFIG['CONSORTIUM'][
 'name'])
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("I have a question about this web site. Whom should I contact?")),
         'text'=>sprintf(_("You should send a mail to %s."),CONFIG['APPEARANCE']['support-contact']['display'])
-      ]);
+        ]);
 
 /**
  * This is a template for further FAQ entries. Simply copy&paste and add more
@@ -81,8 +81,8 @@ 
     <?php
     $i =0;
     foreach ($FAQ as $faq) {
-       print '<a href="#toc'.$i.'">'.$faq['title']."</a><br>\n";
-       $i++;
+        print '<a href="#toc'.$i.'">'.$faq['title']."</a><br>\n";
+        $i++;
     }
     ?>
     </div>
@@ -90,8 +90,8 @@ 
     <?php
     $i =0;
     foreach ($FAQ as $faq) {
-      print "<dt><a name=toc$i>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
-      $i++;
+        print "<dt><a name=toc$i>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
+        $i++;
     }
     ?>
 </dl>

Spacing +14 added lines, -14 removed lines

@@ -10,18 +10,18 @@ 
 array_push($FAQ,
       [
         'title'=>sprintf(_("What can I do to get my institution listed?")),
-        'text'=>sprintf(_("Contact %s administrators at your home institution and complain. It will take at most one hour of their time to get things done."),CONFIG['CONSORTIUM']['name'])
+        'text'=>sprintf(_("Contact %s administrators at your home institution and complain. It will take at most one hour of their time to get things done."), CONFIG['CONSORTIUM']['name'])
 ]);
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"),CONFIG['CONSORTIUM']['name']),
-        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."),CONFIG['CONSORTIUM']['name'],CONFIG['CONSORTIUM']['name'])
+        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"), CONFIG['CONSORTIUM']['name']),
+        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."), CONFIG['CONSORTIUM']['name'], CONFIG['CONSORTIUM']['name'])
       ]);
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"),CONFIG['CONSORTIUM']['name']),
+        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"), CONFIG['CONSORTIUM']['name']),
         'text'=>sprintf(_("When you are connecting from an unconfigured device your security is at risk. The very point of preconfiguration is to set up security, when this is done, your device will first confirm that it talks to the correct authentication server and will never send your password to an untrusted one."))
 ]);
 
@@ -35,29 +35,29 @@ 
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("Is it safe to use %s installers?"),CONFIG['APPEARANCE']['productname']),
-        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."),CONFIG['APPEARANCE']['productname']).' '.( isset(CONFIG['CONSORTIUM']['signer_name']) && CONFIG['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."),CONFIG['APPEARANCE']['productname'],CONFIG['CONSORTIUM']['signer_name']):""),
+        'title'=>sprintf(_("Is it safe to use %s installers?"), CONFIG['APPEARANCE']['productname']),
+        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['APPEARANCE']['productname']) . ' ' . (isset(CONFIG['CONSORTIUM']['signer_name']) && CONFIG['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), CONFIG['APPEARANCE']['productname'], CONFIG['CONSORTIUM']['signer_name']) : ""),
         
 ]);
 
 array_push($FAQ,
       [
         'title'=>_("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(CONFIG['CONSORTIUM']['signer_name']) && CONFIG['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."),CONFIG['CONSORTIUM']['signer_name'])." ":"").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."),"<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(CONFIG['CONSORTIUM']['signer_name']) && CONFIG['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), CONFIG['CONSORTIUM']['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
         
 ]);
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"),CONFIG['CONSORTIUM']['name']),
-      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."),CONFIG['CONSORTIUM'][
+        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"), CONFIG['CONSORTIUM']['name']),
+      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."), CONFIG['CONSORTIUM'][
 'name'])
 ]);
 
 array_push($FAQ,
       [
         'title'=>sprintf(_("I have a question about this web site. Whom should I contact?")),
-        'text'=>sprintf(_("You should send a mail to %s."),CONFIG['APPEARANCE']['support-contact']['display'])
+        'text'=>sprintf(_("You should send a mail to %s."), CONFIG['APPEARANCE']['support-contact']['display'])
       ]);
 
 /**
@@ -79,18 +79,18 @@ 
     </h1>
     <div class="faq_toc" style="background:white; padding:5px;">
     <?php
-    $i =0;
+    $i = 0;
     foreach ($FAQ as $faq) {
-       print '<a href="#toc'.$i.'">'.$faq['title']."</a><br>\n";
+       print '<a href="#toc' . $i . '">' . $faq['title'] . "</a><br>\n";
        $i++;
     }
     ?>
     </div>
     <dl>
     <?php
-    $i =0;
+    $i = 0;
     foreach ($FAQ as $faq) {
-      print "<dt><a name=toc$i>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
+      print "<dt><a name=toc$i>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n";
       $i++;
     }
     ?>

web/4013.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
 <body>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
+        print '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
         echo '<table id="lang_select"><tr><td>';
@@ -41,8 +41,8 @@ 
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
-        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p>
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
+        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p>
         <h2>401/403</h2>
         <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . CAT::get_lang())?></p>
     </div>