1,2d0
< #!/usr/bin/perl
< #
4c2,4
< { my $q=$_[0];
---
> { my ($q,$id,$action)=@_;
> 
>   param2var($q);
7,9c7,9
<   # print ("<br> DB: action= $action ");
<   # print ("<br> DB: StreetName= $StreetName ");
<   # print ("<br> DB: StreetAddress= $StreetAddress ");
---
>   #print ("<br> DB: action= $action ");
>   #print ("<br> DB: StreetName= $StreetName ");
>   #print ("<br> DB: StreetAddress= $StreetAddress ");
11c11
<   require "subMemberInformation.pl";
---
>   # require "subMemberInformation.pl";
20c20
<   for($i=0;$i<=$#list;$i++)
---
>   for(my $i=0;$i<=$#list;$i++)
22c22
<     my $red= &COMMENT("(required)");
---
>     my $red= &XCOMMENT("(required)");
52c52
<   # undef %Images;
---
> 
57d56
< 
59,61d57
<   print &HTMLMemberInfoHeader();
< #######################################################
<   #  print $q->h2("Member Information");
65d60
< 
67,68c62,64
<    # print "<br>(000 action=$action>>FindMyName=$FindMyName>>$NameChoice=$NameChoice";
<    #
---
>   	# print "<br>DB:000 action=$action LastName=$LastName FirstName=$FirstName";
>    # if( !$LastName or !$FirstName) 
>    # {#TEST
73c69,71
< 
---
>   elsif( $action eq "Cancel" and $LastForm eq "ChooseNameForm") 
>   { goto STARTMENU;
>   }
75c73
<       and !($LastName and $FirstName)
---
>       and (!$LastName or !$FirstName)
79a78,105
>   # }#TEST
> 
>   elsif( 
>     ( $action eq "Finished" or $action =~ m/Cancel/ )
>       and ($LastName and $FirstName)
>    )
>   { goto MEMBERINFOFORM;
>   }
> 
>   elsif( $action eq "EditName" ) 
>   { 
>     &undefList("SignIn");
>     goto EDITNAME;
>   }
> 
>   elsif( $action eq "AddName" ) 
>   { 
>     my $xStreetName= $StreetName;
>     my $xStreetAddress= $StreetAddress;
>     &undefDBvar;
>     &undefList("SignIn");
>     $StreetName= $xStreetName;
>     $StreetAddress= $xStreetAddress;
>     $q->param('LastAction',$action);
>     &hiddenParam($q,'LastAction');
>     goto ADDNAME;
>   }
> 
125,129c151,164
<   elsif( $action =~ m/NameChoice:/ ) 
<   { 
<     $NameChoice = $action;
<     $NameChoice =~ s/NameChoice://;
<     ($LastName,$FirstName)=split(/[\t,]/,$NameChoice);
---
>   elsif( $action =~ m/NameChoice--> / ) 
>   { $NameChoice = $action;
>     $NameChoice =~ s/NameChoice--> //;
>     #
>     # reset SignIn from NameChoice
>     ($LastName,$FirstName)=split(/[\t,;]/,$NameChoice);
>     $SignIn="$LastName\t$FirstName";
>     $id=$SignIn;
>     
>     $q->delete_all;
> 
>     &var2param($q,split(/,/,"id,SignIn"));
>     $id = get_id( $q );
> 
137,140d171
<   elsif( $action eq "FindMyName" and !$FindMyName ) 
<   { goto STARTMENU;
<   }
< 
145,152c176,177
<   elsif( $action eq "AddName" ) 
<   { 
<     my $xStreetName= $StreetName;
<     my $xStreetAddress= $StreetAddress;
<     &undefDBvar;
<     $StreetName= $xStreetName;
<     $StreetAddress= $xStreetAddress;
<     goto ADDNAME;
---
>   elsif( $action eq "FindMyName" and !$FindMyName ) 
>   { goto STARTMENU;
167c192
<     print "<br>>>>NEWNAME $action, $FirstName,$LastName,$StreetName,$StreetAddress<< ";
---
>     #  print "<br>>>>NEWNAME $action, $FirstName,$LastName,$StreetName,$StreetAddress,$Comment,$SkillForEmergency<< ";
169a195,202
>     
> #######################
>   EDITNAME:
>     &Eval_QUERY_STRING;
>     &loadNameData($q);
>     &output_form($q);	# memberForm
>     goto EXIT;
>     
174d206
<     print "<br>>>>ADDNAME $action, $FirstName,$LastName,$StreetName,$StreetAddress<< ";
180a213
>     print $q->h3( "Select Name Form");
182,183d214
<     #undef $LastName,$FirstName,$NameChoice;
<     undef %possiblenames;
200d230
<       # <td><input type=submit name=NameChoice value='$name' >
202c232
<       <td><input type=submit name=action value='NameChoice:$name' >
---
>       <td><input type=submit name=action value='NameChoice--> $name' >
207c237
<     <input type=submit name=action value='FindMyName'> 
---
>     <input type=submit name=action value='FindMyName' > 
209c239
<     <tr> <td><input type=submit name=action value='Cancel'> </td> </tr>";
---
>     <tr> <td><input type=submit name=action value='Cancel' > </td> </tr>";
220d249
< # print "YYY StartMenu YYY";
221a251
>     print $q->h3("Sign In Form");
231,236c261,263
<     print $q->submit('action','Downloads');
<     ###
<     
<     print hr();
<     print $q->submit('action','View Maps');
<     print "<br>";
---
>     $q->delete_all;
>     &var2param($q,split(/,/,"id,SignIn"));
>     $id = get_id( $q );
242d268
<     #print "<br>YYY $action YYY";
246c272
<     if( ($check=&checkData) eq "ok")
---
>     if( (my $check=&checkData) eq "ok")
259d284
<       # print "CCC Skills:: $SkillsForEmergency;;@SkillsForEmergency";
261c286,294
<       print &COMMENT(&BOLD("!! THANK YOU !!<br>"));
---
> 
>       print &COMMENT("!! THANK YOU !!<br>");
>       print $q->hr;
> 
>       if($LastAction eq "AddName"
> 	  or
>        	$LastAction eq "EditName")
>       { goto EXIT;
>       }
270c303
<       <input type=submit name=action value='FindMyName'> 
---
>       <input type=submit name=action value='FindMyName' id=$id> 
272c305
<       <tr> <td><input type=submit name=action value='Cancel'> 
---
>       <tr> <td><input type=submit name=action value='Cancel' id=$id> 
279d311
<       undef $action;
288,289c320,326
<     &loadNameData($q);
<     &output_form($q);	# memberForm
---
>   	# print "<br>DB: MEMBERFORM: $SignIn , ($LastName,$FirstName)";
>   # if($SignIn eq "$LastName\t$FirstName") # ONLY print FORM if you are SignIn
>     {
>       &loadNameData($q);
>       &output_form($q);	# memberForm
>       &output_extra_form($q);	# memberForm
>     }
296c333
<     my $cmd=
---
>     $cmd=
317,319c354,355
<     print hr();
<     print $q->submit('action','Finished');
<     print $q->end_form;
---
>     &SubmitActionList($q,"Finished");
>     # print $q->submit('action','Finished');
343,344c379,380
<     my $address=&vAddressFromArray($StreetName,$StreetAddress,$subAddress);
<     my $name="$LastName\t$FirstName";
---
>     $address=&vAddressFromArray($StreetName,$StreetAddress,$subAddress);
>     $name="$LastName\t$FirstName";
353c389,392
<   &output_end($q);
---
>   $LastAction=$action;
>   &var2param($q,split(/,/,"id,SignIn,LastName,FirstName,LastAction"));
>   &hiddenParam($q,"id,SignIn,LastAction");
>   print $q->end_form;
378,380c417
< }
< 
< 1;
---
> };