Added check for ValidateEmail before validating an email in the UserM…

…odel. Added some timestamp synching to inserting a user. Don't nullify the DateFirstVisit and DateLastActive fields when deleting a user.
Emaratilicious · Sep 15, 2011 · 614e6b8 · 614e6b8
1 parent 300a5dd
commit 614e6b8
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/applications/dashboard/models/class.usermodel.php b/applications/dashboard/models/class.usermodel.php
@@ -775,7 +775,7 @@ public function Save($FormPostValues, $Settings = FALSE) {
       $this->DefineSchema();
 
       // Add & apply any extra validation rules:
-      if (array_key_exists('Email', $FormPostValues))
+      if (array_key_exists('Email', $FormPostValues) && GetValue('ValidateEmail', $Settings, TRUE))
          $this->Validation->ApplyRule('Email', 'Email');
 
       // Custom Rule: This will make sure that at least one role was selected if saving roles for this user.
@@ -1409,10 +1409,11 @@ public function AddInsertFields(&$Fields) {
          $Fields['HourOffset'] = $HourOffset;
       }
 
-      // Set some required dates
-      $Fields[$this->DateInserted] = Gdn_Format::ToDateTime();
-      $Fields['DateFirstVisit'] = Gdn_Format::ToDateTime();
-      $Fields['DateLastActive'] = Gdn_Format::ToDateTime();
+      // Set some required dates.
+      $Now = Gdn_Format::ToDateTime();
+      $Fields[$this->DateInserted] = $Now;
+      $Fields['DateFirstVisit'] = $Now;
+      $Fields['DateLastActive'] = $Now;
    }
 
    /**
@@ -1666,9 +1667,6 @@ public function Delete($UserID, $Options = array()) {
             'Attributes' => Gdn_Format::Serialize(array('State' => 'Deleted')),
             'DateSetInvitations' => null,
             'DateOfBirth' => null,
-            'DateFirstVisit' => null,
-            'DateLastActive' => null,
-//            'DateInserted' => '1975-09-16 00:00:00',
             'DateUpdated' => Gdn_Format::ToDateTime(),
             'HourOffset' => '0',
             'Score' => null,