nomadix, RT#5876

2 files changed, 16 insertions, 2 deletions

diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
index 12452e6..fb4a7c5 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi
@@ -229,6 +229,7 @@ if ( $magic eq 'process' || $action eq 'process_signup' ) {
                 invoicing_list referral_custnum promo_code reg_code
                 pkgpart refnum agentnum
                 username sec_phrase _password popnum
+                mac_addr
                 countrycode phonenum sip_password pin
               ),
             grep { /^snarf_/ } $cgi->param
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index ae7b222..3f8e4a3 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -38,7 +38,7 @@
 %>
 
 <%=
-  $OUT = join("\n", map { qq|<input type="hidden" name="$_" />| } qw / promo_code reg_code pkgpart username _password _password2 sec_phrase popnum countrycode phonenum sip_password pin / );
+  $OUT = join("\n", map { qq|<input type="hidden" name="$_" />| } qw / promo_code reg_code pkgpart username _password _password2 sec_phrase popnum mac_addr countrycode phonenum sip_password pin / );
 %>
 
 Where did you hear about our service? <SELECT NAME="refnum">
@@ -46,7 +46,7 @@ Where did you hear about our service? <SELECT NAME="refnum">
   $OUT .= '<OPTION VALUE="">' unless $refnum;
   foreach my $part_referral ( @part_referral ) {
     $OUT .= '<OPTION VALUE="'. $part_referral->{'refnum'}. '"';
-    $OUT .= ' SELECTED' if $part_referral->{'refnum'} eq $refnum;
+    $OUT .= ' SELECTED' if $part_referral->{'refnum'} == $refnum;
     $OUT .= '>'. $part_referral->{'referral'};
   }
 %>
@@ -316,6 +316,18 @@ SECPHRASE
       $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
     }
 
+    if ( $nomadix ) {
+
+      warn $mac_addr;
+      $mac_addr ||= $MA;
+      warn $mac_addr;
+
+      $OUT .= <<NOMADIX;
+        <INPUT TYPE="hidden" NAME="mac_addr" VALUE="$mac_addr">
+NOMADIX
+
+    }
+
   }
 
   if ( @svc_acct_pop ) {
@@ -380,6 +392,7 @@ function fixup_form() {
     var signup_elements = new Array (
       'promo_code', 'reg_code', 'pkgpart',
       'username', '_password', '_password2', 'sec_phrase', 'popnum',
+      'mac_addr',
       'countrycode', 'phonenum', 'sip_password', 'pin'
     );