Passed
Push — release_2_0 ( 341cc0...210320 )
by Tomasz
22:56 queued 29s
created
devices/ms/Files/common.inc 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -135,10 +135,10 @@  discard block
 block discarded – undo
135 135
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
136 136
 !define MUI_COMPONENTSPAGE_SMALLDESC
137 137
 
138
-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprint_nsi(_("Welcome to the %s installer")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?>"
139
-!define FAREWELL_HEADER "<?php WindowsCommon::echo_nsi( _("Installation complete"))?>"
140
-!define FAREWELL_TEXT	"<?php WindowsCommon::echo_nsi( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(  _("Your system is ready."))?>"
141
-!define FAREWELL_FAIL	"<?php WindowsCommon::echo_nsi( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi( _("Please contact \${SUPPORT}."))?>"
138
+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprint_nsi(_("Welcome to the %s installer")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?>"
139
+!define FAREWELL_HEADER "<?php WindowsCommon::echo_nsi(_("Installation complete"))?>"
140
+!define FAREWELL_TEXT	"<?php WindowsCommon::echo_nsi(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(_("Your system is ready."))?>"
141
+!define FAREWELL_FAIL	"<?php WindowsCommon::echo_nsi(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(_("Please contact \${SUPPORT}."))?>"
142 142
 ;--------------------------------
143 143
 ;Languages
144 144
 !insertmacro MUI_LANGUAGE "${LANG}"
@@ -146,14 +146,14 @@  discard block
 block discarded – undo
146 146
 ;--------------------------------
147 147
 ; License file
148 148
 !ifdef LICENSE_FILE
149
-LicenseForceSelection checkbox "<?php WindowsCommon::echo_nsi( _("Accept"))?>"
149
+LicenseForceSelection checkbox "<?php WindowsCommon::echo_nsi(_("Accept"))?>"
150 150
 LicenseText "<?php WindowsCommon::echo_nsi(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
151 151
 LicenseData ${LICENSE_FILE}
152 152
 !endif
153 153
 
154 154
 ;-----------------------------------
155 155
 
156
-MiscButtonText "" "" "" "<?php WindowsCommon::echo_nsi( _("Finish"))?>"
156
+MiscButtonText "" "" "" "<?php WindowsCommon::echo_nsi(_("Finish"))?>"
157 157
 ;----------------------------------
158 158
 ;  FUNCTIONS
159 159
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 
187 187
 !macro install_ca_cert ca_file ca_fingerprint level
188 188
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
189
-   DetailPrint "<?php WindowsCommon::echo_nsi( _("searching for certificate"))?> ${ca_file}"
189
+   DetailPrint "<?php WindowsCommon::echo_nsi(_("searching for certificate"))?> ${ca_file}"
190 190
    File "${ca_file}"
191 191
    nsArray::Set Delete_files "${ca_file}"
192 192
    !insertmacro debug_cat 2 "Testing machine store root"
@@ -248,13 +248,13 @@  discard block
 block discarded – undo
248 248
    ${EndIf}
249 249
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
250 250
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
251
-   DetailPrint "<?php WindowsCommon::echo_nsi( _("installing certificate"))?> ${ca_file}"
251
+   DetailPrint "<?php WindowsCommon::echo_nsi(_("installing certificate"))?> ${ca_file}"
252 252
    nsExec::Exec '"certutil" -addstore -user ${level} "$TEMP"\${ca_file}'
253 253
    Pop $0
254 254
    !insertmacro debug_cat 3 "certutil returned $0"
255 255
    ${If} $0 != 0
256 256
      IfSilent +2
257
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("could not install certificate"))?>  ${ca_file}"
257
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("could not install certificate"))?>  ${ca_file}"
258 258
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
259 259
    ${EndIf}
260 260
 no_install_${ca_file}:
@@ -461,26 +461,26 @@  discard block
 block discarded – undo
461 461
   pop $R0
462 462
   ${If} $tkip_count > 0
463 463
     ${If} $aes_count > 1
464
-      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
464
+      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
465 465
     ${Else}
466
-     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
466
+     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
467 467
     ${EndIf}
468 468
   ${Else}
469 469
     StrCpy $R1 ""
470 470
   ${EndIf}
471 471
   ${If} $profile_count > 0
472
-    StrCpy $welcome_message "<?php WindowsCommon::echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
473
-<?php WindowsCommon::echo_nsi( _("The installer will create the following wireless profiles:"))?>$\r$\n\
472
+    StrCpy $welcome_message "<?php WindowsCommon::echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
473
+<?php WindowsCommon::echo_nsi(_("The installer will create the following wireless profiles:"))?>$\r$\n\
474 474
 $R0.\
475 475
 $R1$\r$\n$\n\
476
-<?php WindowsCommon::echo_nsi( _("More information and comments:"))?>$\r$\n\
476
+<?php WindowsCommon::echo_nsi(_("More information and comments:"))?>$\r$\n\
477 477
    EMAIL: ${SUPPORT}$\r$\n\
478 478
    WWW: ${URL}"
479 479
 ${Else}
480
-StrCpy $welcome_message "<?php WindowsCommon::echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
481
-<?php WindowsCommon::echo_nsi( _("The installer will create the wireless profile:"))?> $R0.\
480
+StrCpy $welcome_message "<?php WindowsCommon::echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
481
+<?php WindowsCommon::echo_nsi(_("The installer will create the wireless profile:"))?> $R0.\
482 482
 $R1$\r$\n$\n\
483
-<?php WindowsCommon::echo_nsi( _("More information and comments:"))?>$\r$\n\
483
+<?php WindowsCommon::echo_nsi(_("More information and comments:"))?>$\r$\n\
484 484
    EMAIL: ${SUPPORT}$\r$\n\
485 485
    WWW: ${URL}"
486 486
 ${EndIf}
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
507 507
 ;TRANSLATION
508 508
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
509
-$\r$\n$\r$\n<?php WindowsCommon::echo_nsi( _("Installer created with software from the GEANT project."))?>"
509
+$\r$\n$\r$\n<?php WindowsCommon::echo_nsi(_("Installer created with software from the GEANT project."))?>"
510 510
   Pop $TEXT
511 511
 
512 512
   SetCtlColors $DIALOG "" 0xffffff
@@ -619,18 +619,18 @@  discard block
 block discarded – undo
619 619
     ${If} $wireless_result == 1
620 620
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
621 621
       IfSilent +2
622
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
622
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
623 623
       Call Cleanup
624 624
     ${EndIf}
625 625
     ${If} $wireless_result == 2
626 626
       IfSilent +2
627
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("No wireless interfaces found. The installer cannot continue."))?>"
627
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("No wireless interfaces found. The installer cannot continue."))?>"
628 628
       Call Cleanup
629 629
     ${EndIf}
630 630
   ${Else}
631 631
     ${If} $wireless_result > 0
632 632
        IfSilent +3
633
-       MessageBox MB_YESNO "<?php WindowsCommon::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
633
+       MessageBox MB_YESNO "<?php WindowsCommon::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
634 634
        Call Cleanup
635 635
        wired_yes:
636 636
        Push 1
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
     ${If} $wired == 1
647 647
       ${If} $force_wired == 0
648 648
         IfSilent wired
649
-        MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
649
+        MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
650 650
         Push 0
651 651
         Pop $wired
652 652
       ${EndIf}
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 ;================================
688 688
 
689 689
 Function ShowInstfiles
690
-  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi( _("Profiles installation"))?>" " "
690
+  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi(_("Profiles installation"))?>" " "
691 691
 FunctionEnd
692 692
 ;================================
693 693
 ;  Check if a wireless profile exist and put it on delete list
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 
707 707
 Function FindProfile
708 708
   Pop $R8
709
-  DetailPrint "<?php WindowsCommon::echo_nsi( _("Checking for profile \$R8"))?>"
709
+  DetailPrint "<?php WindowsCommon::echo_nsi(_("Checking for profile \$R8"))?>"
710 710
   !insertmacro debug_cat 2 "Checking for profile $R8"
711 711
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
712 712
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
   !insertmacro debug_cat 4 "netsh returned $0"
715 715
   ${If} $0 == 0
716 716
     !insertmacro debug_cat 1 "found profile $R8"
717
-    DetailPrint "<?php WindowsCommon::echo_nsi( _("found profile \$R8"))?>"
717
+    DetailPrint "<?php WindowsCommon::echo_nsi(_("found profile \$R8"))?>"
718 718
     Push 0
719 719
   ${Else}
720 720
     !insertmacro debug_cat 1 "profile $R8 not found"
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
     ${If} $Symantec_installed  != 0
810 810
      !insertmacro debug_cat 3 "Symantec problem"
811 811
      IfSilent +2
812
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::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_CONFASSISTANT['CONSORTIUM']['display_name']) ?>"
812
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::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_CONFASSISTANT['CONSORTIUM']['display_name']) ?>"
813 813
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
814 814
     Quit
815 815
 
@@ -1097,7 +1097,7 @@  discard block
 block discarded – undo
1097 1097
 Function PFXCertificateSelect
1098 1098
   !ifndef SILVERBULLET
1099 1099
 ;TRANSLATION
1100
-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprint_nsi(_("%s installer for")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?> " "<?php WindowsCommon::echo_nsi(_("Install personal certificate"))?>"
1100
+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprint_nsi(_("%s installer for")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?> " "<?php WindowsCommon::echo_nsi(_("Install personal certificate"))?>"
1101 1101
 ;TRANSLATION
1102 1102
     IfSilent +2
1103 1103
   MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echo_nsi(_("Click OK to continue"))?> "
@@ -1113,7 +1113,7 @@  discard block
 block discarded – undo
1113 1113
         $certPasswordLength = strlen($certPasswordLabel);
1114 1114
         $certUsernameLabel = WindowsCommon::sprint_nsi(_("Username:"));
1115 1115
         $certUsernameLength = strlen($certUsernameLabel);
1116
-        $labelLength = max($certPasswordLength,$certUsernameLength);
1116
+        $labelLength = max($certPasswordLength, $certUsernameLength);
1117 1117
   ?>
1118 1118
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echo_nsi(_("Selected file: \$Cert_file"))?>"
1119 1119
   !else
@@ -1130,11 +1130,11 @@  discard block
 block discarded – undo
1130 1130
   !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
1131 1131
   ${If} $VistaNoSP == 0
1132 1132
     !ifdef PFX_USERNAME
1133
-       !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
1134
-       !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
1133
+       !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
1134
+       !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
1135 1135
     !else
1136
-       !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u"
1137
-       !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u"
1136
+       !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u"
1137
+       !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u"
1138 1138
     !endif
1139 1139
     ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
1140 1140
     ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
@@ -1496,7 +1496,7 @@  discard block
 block discarded – undo
1496 1496
 Section "-start"
1497 1497
 SectionIn RO
1498 1498
 
1499
-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi( _("Installation"))?>" "<?php WindowsCommon::echo_nsi( _("Checking for existing wireless profiles"))?>"
1499
+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi(_("Installation"))?>" "<?php WindowsCommon::echo_nsi(_("Checking for existing wireless profiles"))?>"
1500 1500
 !ifndef PWD
1501 1501
 !include "certs.nsh"
1502 1502
 !endif
Please login to merge, or discard this patch.