GEANT / CAT

core/UserManagement.php

Spacing +5 added lines, -5 removed lines

@@ -146,7 +146,7 @@ 
                 } else {
                     $this->databaseHandle->exec("INSERT INTO ownership (user_id, institution_id, blesslevel, orig_mail) VALUES(?, ?, ?, ?)", "siss", $owner, $catId, $level, $destMail);
                 }
-                $this->loggerInstance->writeAudit((string) $owner, "OWN", "IdP " . $invitationDetails->cat_institution_id . " - added user as owner");
+                $this->loggerInstance->writeAudit((string) $owner, "OWN", "IdP ".$invitationDetails->cat_institution_id." - added user as owner");
                 common\Entity::outOfThePotatoes();
                 return new IdP($invitationDetails->cat_institution_id);
             }
@@ -168,7 +168,7 @@ 
                 $idp = new IdP($fed->newIdP($invitationDetails->invite_fortype, $owner, $invitationDetails->invite_issuer_level, $invitationDetails->invite_dest_mail, $bestnameguess));
             }
             $idp->addAttribute("general:instname", 'C', $bestnameguess);
-            $this->loggerInstance->writeAudit($owner, "NEW", "IdP " . $idp->identifier . " - created from invitation");
+            $this->loggerInstance->writeAudit($owner, "NEW", "IdP ".$idp->identifier." - created from invitation");
 
             // in case we have more admins in the queue which were invited to 
             // administer the same inst but haven't redeemed their invitations 
@@ -182,7 +182,7 @@ 
                              WHERE invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0 AND name = ? AND country = ? AND ( cat_institution_id IS NULL OR external_db_uniquehandle IS NULL ) ", "ss", $invitationDetails->name, $invitationDetails->country);
             // SELECT -> resource, no boolean
             while ($pendingDetail = mysqli_fetch_object(/** @scrutinizer ignore-type */ $otherPending)) {
-                $this->databaseHandle->exec("UPDATE invitations SET cat_institution_id = " . $idp->identifier . " WHERE id = " . $pendingDetail->id);
+                $this->databaseHandle->exec("UPDATE invitations SET cat_institution_id = ".$idp->identifier." WHERE id = ".$pendingDetail->id);
             }
         
             common\Entity::outOfThePotatoes();
@@ -281,9 +281,9 @@ 
         $retval = [];
         $invitations = $this->databaseHandle->exec("SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token , TIMESTAMPADD(DAY, 1, invite_created) as expiry
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+                                        WHERE cat_institution_id " . ($idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL")." AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
         // SELECT -> resource, not boolean
-        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation" ) . ".\n");
+        $this->loggerInstance->debug(4, "Retrieving pending invitations for ".($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation").".\n");
         while ($invitationQuery = mysqli_fetch_object(/** @scrutinizer ignore-type */ $invitations)) {
             $retval[] = ["country" => $invitationQuery->country, "name" => $invitationQuery->name, "mail" => $invitationQuery->invite_dest_mail, "token" => $invitationQuery->invite_token, "expiry" => $invitationQuery->expiry];
         }

web/skins/modern/test.php

Indentation +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
          <?php if (empty($_REQUEST['idp'])) { ?>
               <div id="front_page">
                   <?php
-                         echo $divs->divTopWelcome();
+                            echo $divs->divTopWelcome();
 //                         echo $divs->div_roller();
 //                         echo $divs->div_main_button(); ?>
               </div> <!-- id="front_page" -->

Spacing +11 added lines, -11 removed lines

@@ -28,9 +28,9 @@ 
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -44,10 +44,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
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
     $profile_list_size = 1;
@@ -58,7 +58,7 @@ 
 require "user/js/cat_js.php";
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->languageInstance->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -67,9 +67,9 @@ 
     front_page = 0;
     var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -77,14 +77,14 @@ 
     <?php echo $divs->divHeading($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>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">

devices/ms/Files/common.inc

Indentation +2 added lines, -2 removed lines

@@ -1115,12 +1115,12 @@
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
         $certUsernameLength = strlen($certUsernameLabel);
         $labelLength = max($certPasswordLength,$certUsernameLength);
-  ?>
+    ?>
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
   !else
   <?php $certPasswordLabel = WindowsCommon::sprintNsis(_("import password:"));
         $certPasswordLength = strlen($certPasswordLabel);
-  ?>
+    ?>
   !insertmacro debug_cat 4 "Unpacking SB_cert.p12"
   File "SB_cert.p12"
   nsArray::Set Delete_files "SB_cert.p12"

Spacing +33 added lines, -33 removed lines

@@ -141,10 +141,10 @@ 
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")),\config\ConfAssistant::CONSORTIUM['display_name'])?>"
-!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis( _("Installation complete"))?>"
-!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(  _("Your system is ready."))?>"
-!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis( _("Please contact \${SUPPORT}."))?>"
+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")), \config\ConfAssistant::CONSORTIUM['display_name'])?>"
+!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis(_("Installation complete"))?>"
+!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Your system is ready."))?>"
+!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Please contact \${SUPPORT}."))?>"
 ;--------------------------------
 ;Languages
 !insertmacro MUI_LANGUAGE "${LANG}"
@@ -152,14 +152,14 @@ 
 ;--------------------------------
 ; License file
 !ifdef LICENSE_FILE
-LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis( _("Accept"))?>"
+LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis(_("Accept"))?>"
 LicenseText "<?php WindowsCommon::echoNsis(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
 LicenseData ${LICENSE_FILE}
 !endif
 
 ;-----------------------------------
 
-MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis( _("Finish"))?>"
+MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis(_("Finish"))?>"
 ;----------------------------------
 ;  FUNCTIONS
 
@@ -192,7 +192,7 @@ 
 
 !macro install_ca_cert ca_file ca_fingerprint level
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
-   DetailPrint "<?php WindowsCommon::echoNsis( _("searching for certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echoNsis(_("searching for certificate"))?> ${ca_file}"
    File "${ca_file}"
    nsArray::Set Delete_files "${ca_file}"
    !insertmacro debug_cat 2 "Testing machine store root"
@@ -254,13 +254,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 WindowsCommon::echoNsis( _("installing certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echoNsis(_("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 WindowsCommon::echoNsis( _("could not install certificate"))?>  ${ca_file}"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("could not install certificate"))?>  ${ca_file}"
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
    ${EndIf}
 no_install_${ca_file}:
@@ -467,26 +467,26 @@ 
   pop $R0
   ${If} $tkip_count > 0
     ${If} $aes_count > 1
-      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
+      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
     ${Else}
-     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
+     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("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 WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echoNsis( _("The installer will create the following wireless profiles:"))?>$\r$\n\
+    StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echoNsis(_("The installer will create the following wireless profiles:"))?>$\r$\n\
 $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${Else}
-StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echoNsis( _("The installer will create the wireless profile:"))?> $R0.\
+StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echoNsis(_("The installer will create the wireless profile:"))?> $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${EndIf}
@@ -512,7 +512,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 WindowsCommon::echoNsis( _("Installer created with software from the GEANT project."))?>"
+$\r$\n$\r$\n<?php WindowsCommon::echoNsis(_("Installer created with software from the GEANT project."))?>"
   Pop $TEXT
 
   SetCtlColors $DIALOG "" 0xffffff
@@ -645,18 +645,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 WindowsCommon::echoNsis( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("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 WindowsCommon::echoNsis( _("No wireless interfaces found. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
   ${Else}
     ${If} $wireless_result > 0
        IfSilent +3
-       MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("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 WindowsCommon::echoNsis(_("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
@@ -672,7 +672,7 @@ 
     ${If} $wired == 1
       ${If} $force_wired == 0
         IfSilent wired
-        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
+        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
         Push 0
         Pop $wired
         wired:
@@ -713,7 +713,7 @@ 
 ;================================
 
 Function ShowInstfiles
-  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Profiles installation"))?>" " "
+  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Profiles installation"))?>" " "
 FunctionEnd
 ;================================
 ;  Check if a wireless profile exist and put it on delete list
@@ -732,7 +732,7 @@ 
 
 Function FindProfile
   Pop $R8
-  DetailPrint "<?php WindowsCommon::echoNsis( _("Checking for profile \$R8"))?>"
+  DetailPrint "<?php WindowsCommon::echoNsis(_("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"'
@@ -740,7 +740,7 @@ 
   !insertmacro debug_cat 4 "netsh returned $0"
   ${If} $0 == 0
     !insertmacro debug_cat 1 "found profile $R8"
-    DetailPrint "<?php WindowsCommon::echoNsis( _("found profile \$R8"))?>"
+    DetailPrint "<?php WindowsCommon::echoNsis(_("found profile \$R8"))?>"
     Push 0
   ${Else}
     !insertmacro debug_cat 1 "profile $R8 not found"
@@ -835,7 +835,7 @@ 
     ${If} $Symantec_installed  != 0
      !insertmacro debug_cat 3 "Symantec problem"
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("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\ConfAssistant::CONSORTIUM['display_name']) ?>"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("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\ConfAssistant::CONSORTIUM['display_name']) ?>"
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
     Quit
 
@@ -1128,7 +1128,7 @@ 
 Function PFXCertificateSelect
   !ifndef SILVERBULLET
 ;TRANSLATION
-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")),\config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")), \config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
 ;TRANSLATION
     IfSilent +2
   MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echoNsis(_("Click OK to continue"))?> "
@@ -1144,7 +1144,7 @@ 
         $certPasswordLength = strlen($certPasswordLabel);
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
         $certUsernameLength = strlen($certUsernameLabel);
-        $labelLength = max($certPasswordLength,$certUsernameLength);
+        $labelLength = max($certPasswordLength, $certUsernameLength);
   ?>
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
   !else
@@ -1161,11 +1161,11 @@ 
   !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
   ${If} $VistaNoSP == 0
     !ifdef PFX_USERNAME
-       !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
-       !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
+       !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
     !else
-       !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u"
-       !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u"
+       !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u"
     !endif
     ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
     ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
@@ -1537,7 +1537,7 @@ 
 Section "-start"
 SectionIn RO
 
-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Installation"))?>" "<?php WindowsCommon::echoNsis( _("Checking for existing wireless profiles"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Installation"))?>" "<?php WindowsCommon::echoNsis(_("Checking for existing wireless profiles"))?>"
 !ifndef PWD
 !include "certs.nsh"
 !endif

core/diag/RFC5997Tests.php

Spacing +18 added lines, -18 removed lines

@@ -88,24 +88,24 @@ 
         $reqAuthenticator = random_bytes(16);
         $packetIdentifier = random_bytes(1);
         // construct Status-Server packet
-        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER .
-                $packetIdentifier .
-                RFC5997Tests::PACKET_LENGTH .
-                $reqAuthenticator .
-                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER .
-                RFC5997Tests::LENGTH_NAS_IDENTIFIER .
+        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER.
+                $packetIdentifier.
+                RFC5997Tests::PACKET_LENGTH.
+                $reqAuthenticator.
+                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER.
+                RFC5997Tests::LENGTH_NAS_IDENTIFIER.
                 RFC5997Tests::VALUE_NAS_IDENTIFIER;
-        $sigPacket = $prePacket .
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
+        $sigPacket = $prePacket.
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
                 "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0";
-        $authPacket = $prePacket .
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
+        $authPacket = $prePacket.
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
                 hash_hmac("md5", $sigPacket, $this->secret, TRUE);
         $connectErrorNumber = 0;
         $connectErrorString = "";
-        $netHandle = fsockopen("udp://" . $this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
+        $netHandle = fsockopen("udp://".$this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
         if ($netHandle === FALSE) {
             throw new Exception("Unable to establish UDP socket resource. Error number was $connectErrorNumber, '$connectErrorString'");
         }
@@ -123,11 +123,11 @@ 
             return AbstractTest::RETVAL_INVALID;
         }
         // check the response authenticator to prevent spoofing.
-        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT .
-                $packetIdentifier .
-                $read[2] . $read[3] .
-                $reqAuthenticator .
-                substr($read, 20) .
+        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT.
+                $packetIdentifier.
+                $read[2].$read[3].
+                $reqAuthenticator.
+                substr($read, 20).
                 $this->secret;
         $expected = hash("md5", $sigResponse, TRUE);
         if ($expected != substr($read, 4, 16)) {

web/lib/user/Gui.php

Spacing +3 added lines, -3 removed lines

@@ -52,10 +52,10 @@
         $ourlocale = $this->languageInstance->getLang();
         header("Content-Type:text/html;charset=utf-8");
         echo "<!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
-          <head lang='" . $ourlocale . "'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale."'>
+          <head lang='" . $ourlocale."'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        echo "<title>".htmlspecialchars($pagetitle)."</title>";
         echo '<script type="text/javascript">ie_version = 0;</script>
 <!--[if IE]>
 <script type="text/javascript">ie_version=1;</script>

web/skins/modern/user/cat_info.php

Spacing +18 added lines, -18 removed lines

@@ -31,7 +31,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();
 
@@ -41,46 +41,46 @@ 
 $subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
         $out = "<div class='padding'>$out</div>";
         break;
     case 'tou':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
+        include_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':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
+        include_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;
@@ -104,15 +104,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':
-                include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
+                include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
                 $out = "<div class='padding'>$out</div>";
                 break;
         }

web/diag/processSociopath.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 \core\CAT::sessionStart();
 $loggerInstance = new \core\common\Logging();
 $loggerInstance->debug(4, "Sociopath test\n");
@@ -33,7 +33,7 @@ 
         return NULL;
     }
     $loggerInstance->debug(4, $_SESSION['EVIDENCE']['QUESTIONSASKED']);
-    $loggerInstance->debug(4, "\nAnswer question " . $QNUM . "\n");
+    $loggerInstance->debug(4, "\nAnswer question ".$QNUM."\n");
     switch ($answer) {
         case 1:
             $loggerInstance->debug(4, "Revaluate with FALSE");

web/diag/magicTelepath.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 $realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
-$nro = filter_input(INPUT_GET,'nro', FILTER_SANITIZE_STRING);
+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
+$nro = filter_input(INPUT_GET, 'nro', FILTER_SANITIZE_STRING);
 \core\CAT::sessionStart();
 $languageObject = new core\common\Language();
 $languageObject->setTextDomain("diagonstics");

web/user/remindIdP.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 \core\CAT::sessionStart();