CollectPassword(): added code to supply another box to confirm

the password, and to stick on this screen until the passwords match.
I wrote this for a now-old Zope Z4I Windows installer, but there's
surely no reason to keep it secret ;-).

Also fiddled all the Pascal code to give it uniform indentation.

inst/WinBuilders/etc/zope.iss.in

@@ -69,23 +69,25 @@ Root: HKLM; Subkey: "Software\Zope Corporation\Zope\<<VERSION>>"; Flags: uninsde
 
 [Code]
 var
-  PasswordPrompts, PasswordValues : array of String;
-  PasswordChars		  : array of char;
+    PasswordPrompts, PasswordValues: array of String;
+    PasswordChars: array of char;
+    Password: string;
 
     DataDirValues: array of String;
-
-  Password	  : string;
-  DataDir		  :  String;
+    DataDir:  String;
 
 function InitializeSetup(): Boolean;
 begin
     { set up password data structures }
-  SetArrayLength(PasswordPrompts, 1);
+    SetArrayLength(PasswordPrompts, 2);
     PasswordPrompts[0] := 'Password:';
-  SetArrayLength(PasswordValues, 1);
+    PasswordPrompts[1] := 'Confirm password:';
+    SetArrayLength(PasswordValues, 2);
     PasswordValues[0] := '';
-  SetArrayLength(PasswordChars, 1);
+    PasswordValues[1] := '';
+    SetArrayLength(PasswordChars, 2);
     PasswordChars[0] := '*';
+    PasswordChars[1] := '*';
     Password := '';
 
     { set up data dir data structures }
@@ -106,8 +108,8 @@ begin
     ScriptDlgPageSetSubCaption1('Select where Zope instance files should be installed');
     ScriptDlgPageSetSubCaption2('Select the folder to which you would like Setup to install Zope "instance" files, then click Next.');
 
- 	if DataDir = '' then DataDir:= 'C:\Zope-Instance';
-	if DataDirValues[0] <> '' then DataDirValues[0]:= '';
+    if DataDir = '' then DataDir := 'C:\Zope-Instance';
+    if DataDirValues[0] <> '' then DataDirValues[0] := '';
 
 	{ Ask for a dir until the user has approved one or clicked Back or Cancel }
 
@@ -121,32 +123,48 @@ begin
             MsgBox(SetupMessage(msgInvalidPath), mbError, MB_OK);
         end;
         if FileOrDirExists(DataDir) then begin
-	      DirOk := MsgBox('Directory Exists' #13#13 'The directory ' + DataDir + ' already exists.  Would you like to create instance files in that directory anyway?', mbConfirmation, MB_YESNO) = idYes;
+            DirOk := MsgBox('Directory Exists' #13#13 'The directory ' +
+                DataDir + ' already exists.  Would you like to create ' +
+                'instance files in that directory anyway?',
+                mbConfirmation, MB_YESNO) = idYes;
         end;
         if not DirOk then Next := InputDir(False, DataDirValues[0], DataDir);
     end;
 
-	Result:=Next;
-
+	Result := Next;
 end;
 
 function CollectPassword(): Boolean;
 var
     Next: Boolean;
+    gotPassword: Boolean;
 begin
     ScriptDlgPageSetSubCaption1('Specify administrator password');
-	ScriptDlgPageSetSubCaption2('The login name for your Zope administrator account is "admin". When you first connect to the Zope management interface, you will need to login using the "admin" username and the password you specify below.');
-	Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
+	ScriptDlgPageSetSubCaption2('The login name for your Zope administrator ' +
+	    'account is "admin". When you first connect to the Zope management ' +
+	    'interface, you will need to login using the "admin" username and ' +
+	    'the password you specify below.');
 
-	while Next and (PasswordValues[0] = '') do begin
-	  MsgBox('You must enter an administrator password', mbError, MB_OK)
+    gotPassword := False;
+    repeat
         Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
+        if Next then begin
+            if PasswordValues[0] = '' then
+                MsgBox('You must enter an administrator password', mbError, MB_OK)
+            else if PasswordValues[0] <> PasswordValues[1] then
+                MsgBox('Please try again -- the passwords don''t match',
+                       mbError, MB_OK)
+            else begin
+                gotPassword := True;
+                Password := PasswordValues[0]
+            end
         end;
-	Password := PasswordValues[0];
-  Result:=Next;
+    until gotPassword or not Next;
+
+    Result := Next;
 end;
 
-function DoInstanceHome():Boolean;
+function DoInstanceHome(): Boolean;
 var
     S : String;
 begin
@@ -182,8 +200,8 @@ begin
 
         while (CurSubPage >=0) and (CurSubPage <=1) and not Terminated do begin
             case CurSubPage of
-	      0:  Next:=CollectInstanceDir();
-	      1:  Next:=CollectPassword();
+                0: Next := CollectInstanceDir();
+                1: Next := CollectPassword();
             end;
 	        if Next then CurSubPage := CurSubPage +1 else CurSubPage := CurSubPage -1;
         end;
@@ -193,9 +211,9 @@ begin
         else
             Result := not Next;
         ScriptDlgPageClose(not Result);
-
     end;
-  Result:=Next;
+
+    Result := Next;
 end;
 
 function NextButtonClick(CurPage: Integer): Boolean;