Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r3270 -r3282
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3270)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3282)
@@ -575,8 +575,8 @@
 	          	$MinPwResetDelay 	= $this->Application->ConfigValue('Users_AllowReset');
 
 	          	$allow_reset = (strlen($PwResetConfirm) ?
-	          					mktime() > $PwRequestTime + $MinPwResetDelay :
-	          					mktime() > $PassResetTime + $MinPwResetDelay);
+	          					adodb_mktime() > $PwRequestTime + $MinPwResetDelay :
+	          					adodb_mktime() > $PassResetTime + $MinPwResetDelay);
 	          }
 
 	          if($found && $allow_reset)
@@ -676,15 +676,15 @@
 		    	$exp_time = $user_object->GetDBField('PwRequestTime') + 3600;
 		    	$user_object->SetDBField("PwResetConfirm", '');
 		      	$user_object->SetDBField("PwRequestTime", 0);
-		      	if ($exp_time > mktime())
+		      	if ( $exp_time > adodb_mktime() )
 		      	{
 		      		//$m_var_list_update['codevalidationresult'] = 'lu_resetpw_confirm_text';
 			    	$newpw = makepassword4();
 
 			    	$this->Application->StoreVar('password', $newpw);
 
 			      	$user_object->SetDBField("Password",$newpw);
-			      	$user_object->SetDBField("PassResetTime", time());
+			      	$user_object->SetDBField("PassResetTime", adodb_mktime());
 			      	$user_object->SetDBField("PwResetConfirm", '');
 			      	$user_object->SetDBField("PwRequestTime", 0);
 			      	$user_object->Update();
@@ -750,7 +750,7 @@
 		function OnCheckExpiredMembership(&$event)
 		{
 			$sql = 'SELECT PortalUserId FROM '.TABLE_PREFIX.'UserGroup
-					WHERE MembershipExpires IS NOT NULL AND MembershipExpires < '.mktime();
+					WHERE MembershipExpires IS NOT NULL AND MembershipExpires < '.adodb_mktime();
 			$user_ids = $this->Conn->GetCol($sql);
 			if(is_array($user_ids) && count($user_ids) > 0)
 			{
@@ -761,10 +761,10 @@
 				}
 			}
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroup
-					WHERE MembershipExpires IS NOT NULL AND MembershipExpires < '.mktime();
+					WHERE MembershipExpires IS NOT NULL AND MembershipExpires < '.adodb_mktime();
 			$this->Conn->Query($sql);
 
-			$pre_expiration = mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24;
+			$pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24;
 			$sql = 'SELECT PortalUserId, GroupId FROM '.TABLE_PREFIX.'UserGroup
 					WHERE MembershipExpires IS NOT NULL AND MembershipExpires < '.$pre_expiration.'
 					AND ExpirationReminderSent = 0';