WebSVN – PEEPS – Diff – /trunk/site/view_user.pl

 #warn "Redirecting errors to ${error_log_path}vorc_error.log";
 use strict;
 use PEEPS;
 use tableViewer qw/inArray notInArray/;
-use CGI qw/param cookie header start_html url url_param/;
+use CGI qw/param cookie header start_html url url_param redirect/;
 use Email::Valid;
 use WebDB;
 use HTML::Tiny;
 use Data::Dumper;
 my ($FORM, $cookie_string, $ERRMSG);
 my @ERRORS;
 my $dbh = getDBConnection ();
 my @FIELDS = qw/ username derby_name derby_short_name default_jersey_number email name_first name_middle name_last password active pronouns birthdate /;
-my @PRIVFIELDS = qw/ email active /;
+my @PRIVFIELDS = qw/ active /;
     if (!$F->{name_last})  { push @ERRORS, "Blank Last Name!"; }
 #    if (!$F->{derby_name}) { $F->{derby_name} = $F->{real_name}; } # If they leave derby_name blank, use their real_name
 #    if (checkDupes ('derby_name', $F->{derby_name})) { push @ERRORS, "Derby Name already in use. Pick a different one."; $F->{derby_name} = ""; }
     if (!$F->{email})      { push @ERRORS, "Blank Email!"; } else {
       $F->{email} =~ s/\s+//g; # make sure people aren't accidentally including spaces
-      $F->{email} = lc $F->{email}; # sometimes people capitalize their email addresses and that's annoying...
       if (! Email::Valid->address (-address => $F->{email}, -mxcheck => 1, -tldcheck => 1)) { push @ERRORS, "Mal-formatted (or fake) Email Address!"; $F->{email} = ""; }
+    }
     if ($F->{default_jersey_number} and $F->{default_jersey_number} !~ /^\d{1,4}$/) { push @ERRORS, "Illegal Jersey Number! (Must be 1 to 4 digits, only.)"; }
     if (checkDupes ('email', 'person', $F->{email})) { push @ERRORS, "Email Address already in use. ".$warn_recovery; $F->{email} = ""; }
     my $OG = getUser ($F->{person_id});
 #    if ($F->{derby_name} ne $OG->{derby_name} and checkDupes ('derby_name', $F->{derby_name})) { push @ERRORS, "Derby Name already in use. Pick a different one."; $F->{derby_name} = ""; }
+#    if (!$F->{derby_name}) { push @ERRORS, "Blank Derby Name!"; }
+    if (!$F->{username})  { push @ERRORS, "Blank Username!"; }
+    if ($F->{username} ne $OG->{username} and checkDupes ('username', 'authentication', $F->{username})) { push @ERRORS, "Username already in use."; $F->{username} = ""; }
-#    if (!$F->{derby_name}) { push @ERRORS, "Blank Derby Name!"; }
+    if (!$F->{name_first})  { push @ERRORS, "Blank First Name!"; }
+    if (!$F->{name_last})  { push @ERRORS, "Blank Last Name!"; }
+    if ($F->{default_jersey_number} and $F->{default_jersey_number} !~ /^\d{1,4}$/) { push @ERRORS, "Illegal Jersey Number! (Must be 1 to 4 digits, only.)"; }
+    if (!$F->{email})      { push @ERRORS, "Blank Email!"; } else {
+      $F->{email} =~ s/\s+//g; # make sure people aren't accidentally including spaces
+      if (! Email::Valid->address (-address => $F->{email}, -mxcheck => 1, -tldcheck => 1)) { push @ERRORS, "Mal-formatted (or fake) Email Address!"; $F->{email} = ""; }
+    }
-    if ($F->{default_jersey_number} and $F->{default_jersey_number} !~ /^\d{1,4}$/) { push @ERRORS, "Illegal Jersey Number! (Must be 1 to 4 digits, only.)"; }
+    if ($F->{email} ne $OG->{email} and checkDupes ('email', 'person', $F->{email})) { push @ERRORS, "Email Address already in use."; $F->{email} = ""; }
     if (exists $F->{newaffiliation}) {
     if (scalar @ERRORS) {
       $ERRMSG = $h->br.join $h->br, @ERRORS;
       display_form ($F->{person_id}, (exists $F->{newaffiliation} or exists $F->{deleteaffiliation}) ? "View" : "Edit", $ERRMSG, $F);
+    }
     if ($ORCUSER->{person_id} == $F->{person_id} or $AL >= PEEPS::SYSADMIN) {
     # They're editing their own record (or a sysadmin).
         $dbh->do ("delete from full_person where id = ? and league_id = ?", undef, $F->{person_id}, $F->{deleteaffiliation});
       } else {
-      } else {
+        my $emailchange;
         foreach my $field (@FIELDS) {
           if ($F->{$field} eq $OG->{$field} or (($field eq "access" or $field eq "showme") and $F->{$field} == $OG->{$field}) or ($field eq "password" and !$F->{$field})) {
           # warn "Changing $field: $F->{$field}";
           if (my $err = changeUser ($F->{person_id}, $field, $F->{$field})) {
             push @ERRORS, $err;
+            logit ($F->{person_id}, "DB ERROR: Updating User Details: $err");
+          } elsif ($field eq "email") {
-            logit ($F->{person_id}, "DB ERROR: Updating User Details: $err");
+            $emailchange = 1;
+          }
+        }
+        if ($emailchange) {
+          ($F->{activation}) = $dbh->selectrow_array ("select activation from authentication where person_id = ?", undef, $F->{person_id});
+          sendNewUserEMail ("Email Change", $F);
+          print redirect (url ( -base => 1 )) if $ORCUSER->{person_id} == $F->{person_id};
+        }
+      }
     } else {
       push @ERRORS, "Attempting to update someone else's record, and you don't have permission to do that.";
       logit ($ORCUSER->{person_id}, "FAIL: You don't have access to update other people's user record");
         # If you're editing your own record, or someone who has higher access than you, make access level read-only
         #$F->{access}      = $h->input ({ type=>"hidden", name=>"access", value=>$F->{access} }).$AccessLevel->{$F->{access}};
       } else {
         #$F->{access}      = $h->select ({ name=>"access" }, [map { $F->{access} == $_ ? $h->option ({ value=>$_, selected=>[] }, $AccessLevel->{$_}) : $h->option ({ value=>$_ }, $AccessLevel->{$_}) } (-1..$ORCUSER->{access})]);
+      }
-      if ($AL == PEEPS::SYSADMIN) {
+#      if ($AL == PEEPS::SYSADMIN) {
-      # TBD:  allow users to change their email, but it'll re-initiate account activation...
+#      # TBD:  allow users to change their email, but it'll re-initiate account activation...
-        $F->{email}      = $h->input ({ type=>"text", name=>"email", value=>$F->{email} });
+#        $F->{email}      = $h->input ({ type=>"text", name=>"email", value=>$F->{email} });
-      } else {
+#      } else {
-        $F->{email}      = $F->{email}.$h->input ({ type=>"hidden", name=>"email", value=>$F->{email} });
+#        $F->{email}      = $F->{email}.$h->input ({ type=>"hidden", name=>"email", value=>$F->{email} });
-      }
+#      }
       if ($ORCUSER->{person_id} eq $F->{person_id} or $ORCUSER->{access} >= PEEPS::SYSADMIN) {
         $F->{username} = $h->input ({ type=>"text", name=>"username", value=>$F->{username} });
+        $F->{email}      = $h->input ({ type=>"text", name=>"email", value=>$F->{email}, onChange=>$ORCUSER->{access} >= PEEPS::SYSADMIN ? "alert('Changing an email address will require the user to reactivate their account');" : "alert('Changing your email address will log you out and require reactivation of your account');" });
         $F->{password}   = $h->input ({ type=>"password", name=>"password" });
         $F->{derby_name} = $h->input ({ type=>"text", name=>"derby_name", value=>$F->{derby_name} });
         $F->{derby_short_name} = $h->input ({ type=>"text", name=>"derby_short_name", value=>$F->{derby_short_name} });
         $F->{default_jersey_number} = $h->input ({ type=>"text", name=>"default_jersey_number", value=>$F->{default_jersey_number} });
         $F->{name_first}  = $h->input ({ type=>"text", name=>"name_first", value=>$F->{name_first} });
   } else {
     my $table = ($field eq "username") ? "authentication" : "person";
     my $id    = ($field eq "username") ? "person_id" : "id";
     if ($field eq "birthdate" and $newvalue eq "") { $newvalue = undef; }
     $dbh->do ("update $table set $field = ? where $id = ?", undef, $newvalue, $uid) or return "ERROR: ".$dbh->errstr;
-    $dbh->do ("replace into full_person select * from v_person where id = ?", undef, $uid);
+    if ($field eq "email") { $dbh->do ("update authentication set activation = md5(rand()) where person_id = ?", undef, $uid) or return "ERROR: ".$dbh->errstr; }
+  }
+  $dbh->do ("replace into full_person select * from v_person where id = ?", undef, $uid);
   $newvalue = '********' if $field eq "password";
   if ($ORCUSER->{person_id} eq $uid) {
     logit ($uid, "Updated Profile: $field -> $newvalue");
     logit ($uid, "$ORCUSER->{derby_name} updated your profile: $field -> $newvalue");
+  }
   return;
-}

Subversion Repositories PEEPS

(root)/trunk/site/view_user.pl – Rev 40 → 41