View GitHub Repository CAT

Schedule Inspection
Subscribe
Passed
Push — release_2_1 ( 486317...21e7c1 )
by Stefan
26:06 queued 10s
created
Status
Category
Toggle Patches
web/skins/modern/test.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -91,7 +91,7 @@
 
 block discarded – undo
91 91 
          <?php if (empty($_REQUEST['idp'])) { ?>
92 92 
               <div id="front_page">
93 93 
                   <?php
94 
-                         echo $divs->divTopWelcome();
94 
+                            echo $divs->divTopWelcome();
95 95 
 //                         echo $divs->div_roller();
96 96 
 //                         echo $divs->div_main_button(); ?>
97 97 
               </div> <!-- id="front_page" -->
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -28,9 +28,9 @@  discard block
 
 block discarded – undo
28 28 
 ?>
29 29
30 30 
 <!-- JQuery -->
31 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
32 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
33 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
31 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
32 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
33 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
34 34 
 <!-- JQuery -->
35 35
36 36 
 <script type="text/javascript">
 
@@ -44,10 +44,10 @@  discard block
 
 block discarded – undo
44 44 
 $operatingSystem = $Gui->detectOS();
45 45 
 $Gui->loggerInstance->debug(4, $operatingSystem);
46 46 
 if ($operatingSystem) {
47 
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
47 
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
48 48 
 }
49 49
50 
-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
50 
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
51 51 
 //TODO modify this based on OS detection
52 52 
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
53 53 
     $profile_list_size = 1;
 
@@ -58,7 +58,7 @@  discard block
 
 block discarded – undo
58 58 
 require "user/js/cat_js.php";
59 59 
 ?>
60 60 
     var loading_ico = new Image();
61 
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
61 
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
62 62 
 </script>
63 63 
 <?php $Gui->languageInstance->setTextDomain("web_user"); ?>
64 64 
 <!-- DiscoJuice -->
 
@@ -67,9 +67,9 @@  discard block
 
 block discarded – undo
67 67 
     front_page = 0;
68 68 
     var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
69 69 
 </script>
70 
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
70 
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
71 71 
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
72 
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
72 
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
73 73 
 </head>
74 74 
 <body>
75 75 
 <div id="wrap">
 
@@ -77,14 +77,14 @@  discard block
 
 block discarded – undo
77 77 
     <?php echo $divs->divHeading($visibility); ?>
78 78 
     <div id="main_page">
79 79 
         <div id="loading_ico">
80 
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
80 
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
81 81 
         </div>
82 82 
         <div id="info_overlay"> <!-- device info -->
83 83 
             <div id="info_window"></div>
84 
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
84 
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
85 85 
         </div>
86 86 
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
87 
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
87 
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
88 88 
           <div id="main_menu_content"></div>
89 89 
         </div>
90 90 
         <div id="main_body">
Please login to merge, or discard this patch.
devices/ms/Files/common.inc 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -1115,12 +1115,12 @@
 
 block discarded – undo
1115 1115 
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
1116 1116 
         $certUsernameLength = strlen($certUsernameLabel);
1117 1117 
         $labelLength = max($certPasswordLength,$certUsernameLength);
1118 
-  ?>
1118 
+    ?>
1119 1119 
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
1120 1120 
   !else
1121 1121 
   <?php $certPasswordLabel = WindowsCommon::sprintNsis(_("import password:"));
1122 1122 
         $certPasswordLength = strlen($certPasswordLabel);
1123 
-  ?>
1123 
+    ?>
1124 1124 
   !insertmacro debug_cat 4 "Unpacking SB_cert.p12"
1125 1125 
   File "SB_cert.p12"
1126 1126 
   nsArray::Set Delete_files "SB_cert.p12"
Please login to merge, or discard this patch.
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch 
@@ -141,10 +141,10 @@  discard block
 
 block discarded – undo
141 141 
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
142 142 
 !define MUI_COMPONENTSPAGE_SMALLDESC
143 143
144 
-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")),\config\ConfAssistant::CONSORTIUM['display_name'])?>"
145 
-!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis( _("Installation complete"))?>"
146 
-!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(  _("Your system is ready."))?>"
147 
-!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis( _("Please contact \${SUPPORT}."))?>"
144 
+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")), \config\ConfAssistant::CONSORTIUM['display_name'])?>"
145 
+!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis(_("Installation complete"))?>"
146 
+!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Your system is ready."))?>"
147 
+!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Please contact \${SUPPORT}."))?>"
148 148 
 ;--------------------------------
149 149 
 ;Languages
150 150 
 !insertmacro MUI_LANGUAGE "${LANG}"
 
@@ -152,14 +152,14 @@  discard block
 
 block discarded – undo
152 152 
 ;--------------------------------
153 153 
 ; License file
154 154 
 !ifdef LICENSE_FILE
155 
-LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis( _("Accept"))?>"
155 
+LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis(_("Accept"))?>"
156 156 
 LicenseText "<?php WindowsCommon::echoNsis(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
157 157 
 LicenseData ${LICENSE_FILE}
158 158 
 !endif
159 159
160 160 
 ;-----------------------------------
161 161
162 
-MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis( _("Finish"))?>"
162 
+MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis(_("Finish"))?>"
163 163 
 ;----------------------------------
164 164 
 ;  FUNCTIONS
165 165 
 
@@ -192,7 +192,7 @@  discard block
 
 block discarded – undo
192 192
193 193 
 !macro install_ca_cert ca_file ca_fingerprint level
194 194 
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
195 
-   DetailPrint "<?php WindowsCommon::echoNsis( _("searching for certificate"))?> ${ca_file}"
195 
+   DetailPrint "<?php WindowsCommon::echoNsis(_("searching for certificate"))?> ${ca_file}"
196 196 
    File "${ca_file}"
197 197 
    nsArray::Set Delete_files "${ca_file}"
198 198 
    !insertmacro debug_cat 2 "Testing machine store root"
 
@@ -254,13 +254,13 @@  discard block
 
 block discarded – undo
254 254 
    ${EndIf}
255 255 
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
256 256 
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
257 
-   DetailPrint "<?php WindowsCommon::echoNsis( _("installing certificate"))?> ${ca_file}"
257 
+   DetailPrint "<?php WindowsCommon::echoNsis(_("installing certificate"))?> ${ca_file}"
258 258 
    nsExec::Exec '"certutil" -addstore -user ${level} "$TEMP"\${ca_file}'
259 259 
    Pop $0
260 260 
    !insertmacro debug_cat 3 "certutil returned $0"
261 261 
    ${If} $0 != 0
262 262 
      IfSilent +2
263 
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("could not install certificate"))?>  ${ca_file}"
263 
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("could not install certificate"))?>  ${ca_file}"
264 264 
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
265 265 
    ${EndIf}
266 266 
 no_install_${ca_file}:
 
@@ -467,26 +467,26 @@  discard block
 
 block discarded – undo
467 467 
   pop $R0
468 468 
   ${If} $tkip_count > 0
469 469 
     ${If} $aes_count > 1
470 
-      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
470 
+      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
471 471 
     ${Else}
472 
-     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
472 
+     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
473 473 
     ${EndIf}
474 474 
   ${Else}
475 475 
     StrCpy $R1 ""
476 476 
   ${EndIf}
477 477 
   ${If} $profile_count > 0
478 
-    StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
479 
-<?php WindowsCommon::echoNsis( _("The installer will create the following wireless profiles:"))?>$\r$\n\
478 
+    StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
479 
+<?php WindowsCommon::echoNsis(_("The installer will create the following wireless profiles:"))?>$\r$\n\
480 480 
 $R0.\
481 481 
 $R1$\r$\n$\n\
482 
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
482 
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
483 483 
    EMAIL: ${SUPPORT}$\r$\n\
484 484 
    WWW: ${URL}"
485 485 
 ${Else}
486 
-StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
487 
-<?php WindowsCommon::echoNsis( _("The installer will create the wireless profile:"))?> $R0.\
486 
+StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
487 
+<?php WindowsCommon::echoNsis(_("The installer will create the wireless profile:"))?> $R0.\
488 488 
 $R1$\r$\n$\n\
489 
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
489 
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
490 490 
    EMAIL: ${SUPPORT}$\r$\n\
491 491 
    WWW: ${URL}"
492 492 
 ${EndIf}
 
@@ -512,7 +512,7 @@  discard block
 
 block discarded – undo
512 512 
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
513 513 
 ;TRANSLATION
514 514 
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
515 
-$\r$\n$\r$\n<?php WindowsCommon::echoNsis( _("Installer created with software from the GEANT project."))?>"
515 
+$\r$\n$\r$\n<?php WindowsCommon::echoNsis(_("Installer created with software from the GEANT project."))?>"
516 516 
   Pop $TEXT
517 517
518 518 
   SetCtlColors $DIALOG "" 0xffffff
 
@@ -645,18 +645,18 @@  discard block
 
 block discarded – undo
645 645 
     ${If} $wireless_result == 1
646 646 
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
647 647 
       IfSilent +2
648 
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
648 
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
649 649 
       Call Cleanup
650 650 
     ${EndIf}
651 651 
     ${If} $wireless_result == 2
652 652 
       IfSilent +2
653 
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. The installer cannot continue."))?>"
653 
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. The installer cannot continue."))?>"
654 654 
       Call Cleanup
655 655 
     ${EndIf}
656 656 
   ${Else}
657 657 
     ${If} $wireless_result > 0
658 658 
        IfSilent +3
659 
-       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
659 
+       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
660 660 
        Call Cleanup
661 661 
        wired_yes:
662 662 
        Push 1
 
@@ -672,7 +672,7 @@  discard block
 
 block discarded – undo
672 672 
     ${If} $wired == 1
673 673 
       ${If} $force_wired == 0
674 674 
         IfSilent wired
675 
-        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
675 
+        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
676 676 
         Push 0
677 677 
         Pop $wired
678 678 
         wired:
 
@@ -713,7 +713,7 @@  discard block
 
 block discarded – undo
713 713 
 ;================================
714 714
715 715 
 Function ShowInstfiles
716 
-  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Profiles installation"))?>" " "
716 
+  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Profiles installation"))?>" " "
717 717 
 FunctionEnd
718 718 
 ;================================
719 719 
 ;  Check if a wireless profile exist and put it on delete list
 
@@ -732,7 +732,7 @@  discard block
 
 block discarded – undo
732 732
733 733 
 Function FindProfile
734 734 
   Pop $R8
735 
-  DetailPrint "<?php WindowsCommon::echoNsis( _("Checking for profile \$R8"))?>"
735 
+  DetailPrint "<?php WindowsCommon::echoNsis(_("Checking for profile \$R8"))?>"
736 736 
   !insertmacro debug_cat 2 "Checking for profile $R8"
737 737 
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
738 738 
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
 
@@ -740,7 +740,7 @@  discard block
 
 block discarded – undo
740 740 
   !insertmacro debug_cat 4 "netsh returned $0"
741 741 
   ${If} $0 == 0
742 742 
     !insertmacro debug_cat 1 "found profile $R8"
743 
-    DetailPrint "<?php WindowsCommon::echoNsis( _("found profile \$R8"))?>"
743 
+    DetailPrint "<?php WindowsCommon::echoNsis(_("found profile \$R8"))?>"
744 744 
     Push 0
745 745 
   ${Else}
746 746 
     !insertmacro debug_cat 1 "profile $R8 not found"
 
@@ -835,7 +835,7 @@  discard block
 
 block discarded – undo
835 835 
     ${If} $Symantec_installed  != 0
836 836 
      !insertmacro debug_cat 3 "Symantec problem"
837 837 
      IfSilent +2
838 
-     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']) ?>"
838 
+     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']) ?>"
839 839 
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
840 840 
     Quit
841 841 
 
@@ -1128,7 +1128,7 @@  discard block
 
 block discarded – undo
1128 1128 
 Function PFXCertificateSelect
1129 1129 
   !ifndef SILVERBULLET
1130 1130 
 ;TRANSLATION
1131 
-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")),\config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
1131 
+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")), \config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
1132 1132 
 ;TRANSLATION
1133 1133 
     IfSilent +2
1134 1134 
   MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echoNsis(_("Click OK to continue"))?> "
 
@@ -1144,7 +1144,7 @@  discard block
 
 block discarded – undo
1144 1144 
         $certPasswordLength = strlen($certPasswordLabel);
1145 1145 
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
1146 1146 
         $certUsernameLength = strlen($certUsernameLabel);
1147 
-        $labelLength = max($certPasswordLength,$certUsernameLength);
1147 
+        $labelLength = max($certPasswordLength, $certUsernameLength);
1148 1148 
   ?>
1149 1149 
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
1150 1150 
   !else
 
@@ -1161,11 +1161,11 @@  discard block
 
 block discarded – undo
1161 1161 
   !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
1162 1162 
   ${If} $VistaNoSP == 0
1163 1163 
     !ifdef PFX_USERNAME
1164 
-       !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
1165 
-       !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
1164 
+       !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
1165 
+       !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
1166 1166 
     !else
1167 
-       !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u"
1168 
-       !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u"
1167 
+       !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u"
1168 
+       !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u"
1169 1169 
     !endif
1170 1170 
     ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
1171 1171 
     ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
 
@@ -1537,7 +1537,7 @@  discard block
 
 block discarded – undo
1537 1537 
 Section "-start"
1538 1538 
 SectionIn RO
1539 1539
1540 
-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Installation"))?>" "<?php WindowsCommon::echoNsis( _("Checking for existing wireless profiles"))?>"
1540 
+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Installation"))?>" "<?php WindowsCommon::echoNsis(_("Checking for existing wireless profiles"))?>"
1541 1541 
 !ifndef PWD
1542 1542 
 !include "certs.nsh"
1543 1543 
 !endif
Please login to merge, or discard this patch.
devices/ms/Files/geant_link.inc 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
   nsArray::Set Delete_files "GEANTLink-ARM64.msi"
93 93 
   File "GEANTLink-ARM64.msi"
94 94 
   IfSilent +2
95 
-  MessageBox MB_OK  "<?php WindowsCommon::echoNsis( _("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."))?>"
95 
+  MessageBox MB_OK  "<?php WindowsCommon::echoNsis(_("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."))?>"
96 96 
   !insertmacro debug_cat 1 "Run GEANTLink installer"
97 97 
   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress'
98 98 
   ClearErrors
 
@@ -104,7 +104,7 @@  discard block
 
 block discarded – undo
104 104 
   Pop $rebootRequired
105 105 
   ${Else}
106 106 
   IfSilent +2
107 
-  MessageBox MB_OK "<?php WindowsCommon::echoNsis( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
107 
+  MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
108 108 
   Quit
109 109 
   ${EndIf}
110 110 
   Cont2:
Please login to merge, or discard this patch.
core/diag/RFC5997Tests.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch 
@@ -88,24 +88,24 @@  discard block
 
 block discarded – undo
88 88 
         $reqAuthenticator = random_bytes(16);
89 89 
         $packetIdentifier = random_bytes(1);
90 90 
         // construct Status-Server packet
91 
-        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER .
92 
-                $packetIdentifier .
93 
-                RFC5997Tests::PACKET_LENGTH .
94 
-                $reqAuthenticator .
95 
-                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER .
96 
-                RFC5997Tests::LENGTH_NAS_IDENTIFIER .
91 
+        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER.
92 
+                $packetIdentifier.
93 
+                RFC5997Tests::PACKET_LENGTH.
94 
+                $reqAuthenticator.
95 
+                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER.
96 
+                RFC5997Tests::LENGTH_NAS_IDENTIFIER.
97 97 
                 RFC5997Tests::VALUE_NAS_IDENTIFIER;
98 
-        $sigPacket = $prePacket .
99 
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
100 
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
98 
+        $sigPacket = $prePacket.
99 
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
100 
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
101 101 
                 "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0";
102 
-        $authPacket = $prePacket .
103 
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
104 
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
102 
+        $authPacket = $prePacket.
103 
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
104 
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
105 105 
                 hash_hmac("md5", $sigPacket, $this->secret, TRUE);
106 106 
         $connectErrorNumber = 0;
107 107 
         $connectErrorString = "";
108 
-        $netHandle = fsockopen("udp://" . $this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
108 
+        $netHandle = fsockopen("udp://".$this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
109 109 
         if ($netHandle === FALSE) {
110 110 
             throw new Exception("Unable to establish UDP socket resource. Error number was $connectErrorNumber, '$connectErrorString'");
111 111 
         }
 
@@ -123,11 +123,11 @@  discard block
 
 block discarded – undo
123 123 
             return AbstractTest::RETVAL_INVALID;
124 124 
         }
125 125 
         // check the response authenticator to prevent spoofing.
126 
-        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT .
127 
-                $packetIdentifier .
128 
-                $read[2] . $read[3] .
129 
-                $reqAuthenticator .
130 
-                substr($read, 20) .
126 
+        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT.
127 
+                $packetIdentifier.
128 
+                $read[2].$read[3].
129 
+                $reqAuthenticator.
130 
+                substr($read, 20).
131 131 
                 $this->secret;
132 132 
         $expected = hash("md5", $sigResponse, TRUE);
133 133 
         if ($expected != substr($read, 4, 16)) {
Please login to merge, or discard this patch.
web/diag/processSociopath.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@  discard block
 
 block discarded – undo
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
22 
+require_once dirname(dirname(__DIR__))."/config/_config.php";
23 23 
 \core\CAT::sessionStart();
24 24 
 $loggerInstance = new \core\common\Logging();
25 25 
 $loggerInstance->debug(4, "Sociopath test\n");
 
@@ -33,7 +33,7 @@  discard block
 
 block discarded – undo
33 33 
         return NULL;
34 34 
     }
35 35 
     $loggerInstance->debug(4, $_SESSION['EVIDENCE']['QUESTIONSASKED']);
36 
-    $loggerInstance->debug(4, "\nAnswer question " . $QNUM . "\n");
36 
+    $loggerInstance->debug(4, "\nAnswer question ".$QNUM."\n");
37 37 
     switch ($answer) {
38 38 
         case 1:
39 39 
             $loggerInstance->debug(4, "Revaluate with FALSE");
Please login to merge, or discard this patch.
web/diag/magicTelepath.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -19,10 +19,10 @@
 
 block discarded – undo
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
22 
+require_once dirname(dirname(__DIR__))."/config/_config.php";
23 23 
 $realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
24 
-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
25 
-$nro = filter_input(INPUT_GET,'nro', FILTER_SANITIZE_STRING);
24 
+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
25 
+$nro = filter_input(INPUT_GET, 'nro', FILTER_SANITIZE_STRING);
26 26 
 \core\CAT::sessionStart();
27 27 
 $languageObject = new core\common\Language();
28 28 
 $languageObject->setTextDomain("diagonstics");
Please login to merge, or discard this patch.
web/user/remindIdP.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@
 
 block discarded – undo
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22 
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23
24 24 
 \core\CAT::sessionStart();
25 25
Please login to merge, or discard this patch.
web/lib/admin/MapOpenLayers.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -83,7 +83,7 @@  discard block
 
 block discarded – undo
83 83
84 84 
 // use HTML5 geolocation
85 85 
         function locateMe() {
86 
-            $('#address').val(\"" . _("locating") . "\");
86 
+            $('#address').val(\"" . _("locating")."\");
87 87 
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
88 88 
         }
89 89 
         
@@ -205,7 +205,7 @@  discard block
 
 block discarded – undo
205 205 
                 view.fit(extent, {padding: [10, 0, 10, 0]});
206 206 
             } else {
207 207 
                 view.setCenter([0,0]);
208 
-                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)] . "'); // use the federation code to locate the country
208 
+                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]."'); // use the federation code to locate the country
209 209 
                 map.setView(view);
210 210 
             }
211 211 
             view.setMaxZoom(20);
 
@@ -227,14 +227,14 @@  discard block
 
 block discarded – undo
227 227 
         function getAddressLocation() {
228 228 
             var city = $('#address').val();
229 229 
             if(city == '') {
230 
-                alert(\"" . _("nothing entered in the address field") . "\");
230 
+                alert(\"" . _("nothing entered in the address field")."\");
231 231 
                 return false;
232 232 
             }
233 233 
             city = city.replace(/\s*,\s*/g,',+');
234 234 
             city = city.replace(/ +/,'+');
235 235 
             $.get(addressService+'?format=json&addressdetails=0&q='+city, '',  function(data) {
236 236 
                 if (data[0] === undefined) {
237 
-                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
237 
+                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
238 238 
                     return;
239 239 
                 }
240 240 
                 showTmpPointer(data[0].lon, data[0].lat);
 
@@ -285,7 +285,7 @@  discard block
 
 block discarded – undo
285 285 
         if ($this->readOnly) {
286 286 
             return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
287 287 
         } else {
288 
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
288 
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
289 289 
         }
290 290 
     }
291 291 
 
@@ -310,7 +310,7 @@  discard block
 
 block discarded – undo
310 310 
         // we don't need this parameter in this subclass
311 311 
         unset($coords);
312 312 
         \core\common\Entity::intoThePotatoes();
313 
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
313 
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
314 314 
         \core\common\Entity::outOfThePotatoes();
315 315 
         return $retval;
316 316 
     }
 
@@ -322,7 +322,7 @@  discard block
 
 block discarded – undo
322 322 
      */
323 323 
     private function findLocationHtml() {
324 324 
         \core\common\Entity::intoThePotatoes();
325 
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
325 
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
326 326 
         \core\common\Entity::outOfThePotatoes();
327 327 
         return $retval;
328 328 
     }
Please login to merge, or discard this patch.
web/lib/admin/Authentication.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -121,7 +121,7 @@
 
 block discarded – undo
121 121 
         if ($trailerPosition !== FALSE) {
122 122 
             $base = substr($scriptself, 0, $trailerPosition);
123 123 
             if ($base !== FALSE) {
124 
-                $url = "//$servername" . $base . "/logout_check.php";
124 
+                $url = "//$servername".$base."/logout_check.php";
125 125 
             }
126 126 
         }
127 127
Please login to merge, or discard this patch.