From 8313f765ce89f752af77e0e0a90f3d1f5981b5b5 Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Wed, 22 Feb 2017 09:37:29 -0600 Subject: [PATCH] Only list active principals in grant selection modified as per Andrew McMillan's suggestion --- inc/ui/principal-edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php index ebcb8234..a2821eaf 100644 --- a/inc/ui/principal-edit.php +++ b/inc/ui/principal-edit.php @@ -612,7 +612,7 @@ function grant_row_editor() { if ( isset($_GET['edit_grant']) ) { $edit_grant_clause = ' AND to_principal != '.intval($_GET['edit_grant']); } - $grantrow->SetLookup( 'to_principal', 'SELECT principal_id, displayname FROM dav_principal WHERE principal_id NOT IN (SELECT to_principal FROM grants WHERE by_principal = '.$id.$edit_grant_clause.') ORDER BY fullname' ); + $grantrow->SetLookup( 'to_principal', 'SELECT principal_id, displayname FROM dav_principal WHERE user_active AND principal_id NOT IN (SELECT to_principal FROM grants WHERE by_principal = '.$id.$edit_grant_clause.') ORDER BY fullname' ); if ( $can_write_principal ) { if ( $grantrow->IsSubmit() ) { if ( $grantrow->IsUpdate() )