Address #60 - Issues with Expiration Dates

AndrewPoppe · Jan 9, 2024 · 54bec2e · 54bec2e
1 parent 7bee769
commit 54bec2e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/ajax/edit_user.php b/ajax/edit_user.php
@@ -86,6 +86,7 @@
     // We ignore expired users, unless the request unexpires them
     $userExpired         = $sagUser->isUserExpired($module->getProjectId());
     $requestedExpiration = urldecode($data['expiration']);
+    $requestedExpiration = \DateTimeRC::format_ts_to_ymd($requestedExpiration);
     $requestedUnexpired  = empty($requestedExpiration) || (strtotime($requestedExpiration) >= strtotime('today'));
     if ( $userExpired && !$requestedUnexpired ) {
         $ignore = true;

diff --git a/ajax/import_export_users.php b/ajax/import_export_users.php
@@ -52,6 +52,7 @@
         // We ignore expired users, unless the request unexpires them
         $userExpired         = $sagUser->isUserExpired($project_id);
         $requestedExpiration = $thisUser['expiration'];
+        $requestedExpiration = \DateTimeRC::format_ts_to_ymd($requestedExpiration);
 
         // This import is requesting the user be expired
         if ( !empty($requestedExpiration) && strtotime($requestedExpiration) < strtotime('today') ) {

diff --git a/ajax/set_user_expiration.php b/ajax/set_user_expiration.php
@@ -20,6 +20,7 @@
 
 $username   = filter_input(INPUT_POST, 'username', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 $expiration = filter_input(INPUT_POST, 'expiration', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+$expiration = \DateTimeRC::format_ts_to_ymd($expiration);
 
 if ( !empty($expiration) && strtotime($expiration) < strtotime('today') ) {
     $errors = false;

diff --git a/classes/APIHandler.php b/classes/APIHandler.php
@@ -212,6 +212,7 @@ private function checkUsers()
                 // We ignore expired users, unless the request unexpires them
                 $userExpired         = $sagUser->isUserExpired($this->projectId);
                 $requestedExpiration = urldecode($thisUser['expiration']);
+                $requestedExpiration = \DateTimeRC::format_ts_to_ymd($requestedExpiration);
 
                 // This import is requesting the user be expired
                 if ( !empty($requestedExpiration) && strtotime($requestedExpiration) < strtotime('today') ) {