Mantis #46993: Filter time limit expired users from mail recipient autocomplete results #10997
+60
−24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mBeym
force-pushed
the
bugfix/ilias10/mail/recipient-autocomplete-filter-time-limit-expired-users
branch
from
9a5c948 to
735ab92
Compare
|
This is great, thank you! I think, for consistency reason, the uses that are not valid yet should be handled the same as expired users. That's how it is in the global search. I added comments in the code. |
klao
reviewed
Feb 3, 2026
Comment on lines
+127
to
+132
| $outer_conditions[] = sprintf( | ||
| '(usr_data.time_limit_unlimited = %s OR (usr_data.time_limit_unlimited = %s AND time_limit_until >= %s))', | ||
| $this->db->quote(1, ilDBConstants::T_INTEGER), | ||
| $this->db->quote(0, ilDBConstants::T_INTEGER), | ||
| $this->db->quote(time(), ilDBConstants::T_INTEGER) | ||
| ); |
There was a problem hiding this comment.
Change to ...?
$outer_conditions[] = sprintf(
'(usr_data.time_limit_unlimited = %s OR (usr_data.time_limit_unlimited = %s AND time_limit_from < %s AND time_limit_until > %s))',
$this->db->quote(1, ilDBConstants::T_INTEGER),
$this->db->quote(0, ilDBConstants::T_INTEGER),
$this->db->quote(time(), ilDBConstants::T_INTEGER),
$this->db->quote(time(), ilDBConstants::T_INTEGER)
);
Comment on lines
+68
to
+73
| $query .= "AND " . sprintf( | ||
| '(usr_data.time_limit_unlimited = %s OR (usr_data.time_limit_unlimited = %s AND time_limit_until >= %s))', | ||
| $this->db->quote(1, ilDBConstants::T_INTEGER), | ||
| $this->db->quote(0, ilDBConstants::T_INTEGER), | ||
| $this->db->quote(time(), ilDBConstants::T_INTEGER) | ||
| ) . " "; |
There was a problem hiding this comment.
Change to ...?
$query .= sprintf(
'AND (usr_data.time_limit_unlimited = %s OR (usr_data.time_limit_unlimited = %s AND time_limit_from < %s AND time_limit_until > %s)) ',
$this->db->quote(1, ilDBConstants::T_INTEGER),
$this->db->quote(0, ilDBConstants::T_INTEGER),
$this->db->quote(time(), ilDBConstants::T_INTEGER),
$this->db->quote(time(), ilDBConstants::T_INTEGER)
);
| @@ -1,27 +1,22 @@ | |||
| <?php | |||
|
|
|||
| /** | |||
Contributor
There was a problem hiding this comment.
Please create a seperte PR for the modifications of this file, since this does belong to another component.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes https://mantis.ilias.de/view.php?id=46993.
If accepted should be picked into release_11 & trunk.