nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-31 03:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update some more uses of usr.email

Browse Source
This commit is contained in:
Andrew Ruthven 2021-02-25 23:26:05 +13:00
parent cd4d0a6bf9
commit 1076fd5bfa
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
inc/caldav-POST.php
View File

@ -117,15 +117,40 @@ function handle_freebusy_request( $ic ) {
/** @todo Refactor this so we only do one query here and loop through the results */ /** @todo Refactor this so we only do one query here and loop through the results */
$params = array( ':session_principal' => $session->principal_id, ':scan_depth' => $c->permission_scan_depth, ':email' => $attendee_email ); $params = array( ':session_principal' => $session->principal_id, ':scan_depth' => $c->permission_scan_depth, ':email' => $attendee_email );
$qry = new AwlQuery('SELECT pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS p, username FROM usr JOIN principal USING(user_no) WHERE lower(usr.email) = lower(:email)', $params ); $qry = new AwlQuery('
SELECT
pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS p,
username
FROM usr
JOIN principal USING (user_no)
JOIN usr_emails USING (user_no)
WHERE lower(usr_emails.email) = lower(:email)
', $params
);
if ( !$qry->Exec('POST',__LINE__,__FILE__) ) $request->DoResponse( 501, 'Database error'); if ( !$qry->Exec('POST',__LINE__,__FILE__) ) $request->DoResponse( 501, 'Database error');
if ( $qry->rows() > 1 ) { if ( $qry->rows() > 1 ) {
// Unlikely, but if we get more than one result we'll do an exact match instead. // Unlikely, but if we get more than one result we'll do an exact match instead.
if ( !$qry->QDo('SELECT pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS p, username FROM usr JOIN principal USING(user_no) WHERE usr.email = :email', $params ) ) if ( !$qry->QDo('
SELECT
pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS p,
username
FROM usr
JOIN principal USING (user_no)
JOIN usr_emails USING (user_no)
WHERE usr_emails.email = :email ', $params ) )
$request->DoResponse( 501, 'Database error'); $request->DoResponse( 501, 'Database error');
if ( $qry->rows() == 0 ) { if ( $qry->rows() == 0 ) {
/** Sigh... Go back to the original case-insensitive match */ /** Sigh... Go back to the original case-insensitive match */
$qry->QDo('SELECT pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS p, username FROM usr JOIN principal USING(user_no) WHERE lower(usr.email) = lower(:email)', $params ); $qry->QDo('
SELECT
pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS p,
username
FROM usr
JOIN principal USING (user_no)
JOIN usr_emails USING (user_no)
WHERE lower(usr_emails.email) = lower(:email)
', $params
);
} }
} }