|
83 | 83 | <ConditionMessage="This setup requires IIS 6.0, 7.0 or 8.0 is installed."><![CDATA[(IIS="#7") OR (IIS="#6") OR (IIS="#8")]]></Condition> |
84 | 84 | <!-- Version 2.7.6 had an uninstall issue that leaves some files behind. Asking the user to manually hash this out.--> |
85 | 85 | <ConditionMessage="A older version of ModSecurityIIS was found in your computer. Please complete uninstall by removing the following file: [FILEEXISTS]. You may have to remove ModSecurity module from IIS, use the IIS Manager to do so."><![CDATA[(NOT FILEEXISTS) OR (Installed)]]></Condition> |
86 | | -<!-- |
87 | | - Won't necessary. We can install 32bits stuff in a 64 machine. If IIS is proper |
88 | | - configured it will work like a charm. |
89 | | -
|
90 | | - <Condition Message="64-bit operating system was detected, please use the 64-bit installer."> |
91 | | - <?if $(var.Win64) = "yes" ?> |
92 | | - VersionNT64 |
93 | | - <?else?> |
94 | | - NOT VersionNT64 |
95 | | - <?endif?> |
96 | | - </Condition> |
97 | | ---> |
| 86 | + <ConditionMessage="64-bit operating system was detected, please use the 64-bit installer."> |
| 87 | + <?if $(var.Win64) ="yes" ?> |
| 88 | + VersionNT64 |
| 89 | + <?else ?> |
| 90 | + NOT VersionNT64 |
| 91 | + <?endif ?></Condition> |
98 | 92 | <MediaId="1"Cabinet="simple.cab"EmbedCab="yes" /> |
99 | 93 | <DirectoryId="TARGETDIR"Name="SourceDir"> |
100 | 94 | <?if $(var.Win64) ="yes" ?> |
|
408 | 402 | <UIId="WixUI_FeatureTreeCustom"> |
409 | 403 | <DialogId="CustomizeDlgModSec"Width="370"Height="270"Title="!(loc.CustomizeDlg_Title)"TrackDiskSpace="yes"> |
410 | 404 | <ControlId="Tree"Type="SelectionTree"X="25"Y="85"Width="175"Height="115"Property="_BrowseProperty"Sunken="yes"TabSkip="no"Text="!(loc.CustomizeDlgTree)"> |
411 | | - <PublishProperty="DisableButton"Value="1"> |
412 | | -(NOT&ModSec64=3) AND (NOT&ModSec32=3) |
413 | | - </Publish> |
414 | | - <PublishProperty="DisableButton"Value="0"> |
415 | | -&ModSec64=3 OR&ModSec32=3 |
416 | | - </Publish> |
| 405 | + <PublishProperty="DisableButton"Value="1">(NOT&ModSec64=3) AND (NOT&ModSec32=3)</Publish> |
| 406 | + <PublishProperty="DisableButton"Value="0">&ModSec64=3 OR&ModSec32=3</Publish> |
417 | 407 | </Control> |
418 | 408 | <ControlId="Browse"Type="PushButton"X="294"Y="210"Width="66"Height="17"Text="!(loc.CustomizeDlgBrowse)"> |
419 | 409 | <PublishEvent="SelectionBrowse"Value="BrowseDlg">1</Publish> |
|
431 | 421 | <ControlId="Back"Type="PushButton"X="192"Y="243"Width="56"Height="17"Text="!(loc.WixUIBack)" /> |
432 | 422 | <ControlId="Next"Type="PushButton"X="248"Y="243"Width="56"Height="17"Default="yes"Text="!(loc.WixUINext)"> |
433 | 423 | <SubscribeEvent="SelectionNoItems"Attribute="Enabled" /> |
434 | | - <ConditionAction="disable"> |
435 | | - DisableButton = 1 |
436 | | - </Condition> |
437 | | - <ConditionAction="enable"> |
438 | | - DisableButton = 0 |
439 | | - </Condition> |
| 424 | + <ConditionAction="disable">DisableButton = 1</Condition> |
| 425 | + <ConditionAction="enable">DisableButton = 0</Condition> |
440 | 426 | </Control> |
441 | 427 | <ControlId="Cancel"Type="PushButton"X="304"Y="243"Width="56"Height="17"Cancel="yes"Text="!(loc.WixUICancel)"> |
442 | 428 | <PublishEvent="SpawnDialog"Value="CancelDlg">1</Publish> |
|
564 | 550 | <CustomActionId="InstallConf"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[SystemFolder]inetsrv\appcmd.exe" set config /section:"system.webServer/ModSecurity" /"enabled:true" /"configFile:[INSTALLFOLDER]modsecurity_iis.conf"" /> |
565 | 551 | <CustomActionId="UninstallConf"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[SystemFolder]inetsrv\appcmd.exe" clear config -section:"system.webServer/ModSecurity"" /> |
566 | 552 | <?endif ?> |
567 | | - |
568 | | -<DirectoryRefId="TARGETDIR"> |
| 553 | + <DirectoryRefId="TARGETDIR"> |
569 | 554 | <?if $(var.Win64) ="yes" ?> |
570 | 555 | <MergeId="VCRedist64"SourceFile="wix\Microsoft_VC120_CRT_x64.msm"DiskId="1"Language="0" /> |
571 | 556 | <MergeId="VCRedist32"SourceFile="wix\Microsoft_VC120_CRT_x86.msm"DiskId="1"Language="0" /> |
|
