nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-01 16:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly migrate this away from PgQuery.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-18 10:47:37 +13:00
parent 4c9544c746
commit 0ddd6508a6
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
inc/caldav-REPORT-principal.php
View File

@ -15,6 +15,7 @@ if ( isset($CS_search_test) && $CS_search_test == 'anyof' ) {
$clause_joiner = " OR "; $clause_joiner = " OR ";
} }
$params = array();
$where = ""; $where = "";
foreach( $searches AS $k => $search ) { foreach( $searches AS $k => $search ) {
$qry_props = $search->GetPath('/DAV::property-search/DAV::prop/*'); // There may be many $qry_props = $search->GetPath('/DAV::property-search/DAV::prop/*'); // There may be many
@ -26,17 +27,21 @@ foreach( $searches AS $k => $search ) {
if ( $subwhere != "" ) $subwhere .= " OR "; if ( $subwhere != "" ) $subwhere .= " OR ";
switch( $v1->GetTag() ) { switch( $v1->GetTag() ) {
case 'DAV::displayname': case 'DAV::displayname':
$subwhere .= "displayname ~* ".qpg('***='.$match); $subwhere .= ' displayname ILIKE :displayname_match ';
$params[':displayname_match'] = '%'.$match.'%';
break; break;
case 'urn:ietf:params:xml:ns:caldav:calendar-user-address-set': case 'urn:ietf:params:xml:ns:caldav:calendar-user-address-set':
$match = preg_replace('#^.*/caldav.php/([^/]+)(/.*)?$#', "\\1", $match); $match = preg_replace('{^.*/caldav.php/([^/]+)(/.*)?$}', '\\1', $match);
$match = qpg('***=' . preg_replace('#^mailto:#', '', $match)); $match = preg_replace('{^mailto:}', '', $match);
$subwhere .= sprintf('(email ~* %s OR username ~* %s)', $match, $match ); $subwhere .= ' (email ILIKE :user_address_match OR username ILIKE :user_address_match) ';
$params[':user_address_match'] = '%'.$match.'%';
break; break;
case 'urn:ietf:params:xml:ns:caldav:calendar-home-set': case 'urn:ietf:params:xml:ns:caldav:calendar-home-set':
$subwhere .= "dav_name ~* ".qpg(preg_replace('#^.*/caldav.php#', '', $match)); $match = preg_replace('{^.*/caldav.php}', '', $match);
$subwhere .= ' dav_name LIKE :calendar_home_match ';
$params[':calendar_home_match'] = $match.'%';
break; break;
default: default:
@ -53,7 +58,7 @@ foreach( $searches AS $k => $search ) {
} }
if ( $where != "" ) $where = "WHERE $where"; if ( $where != "" ) $where = "WHERE $where";
$sql = "SELECT * FROM dav_principal $where ORDER BY principal_id LIMIT 100"; $sql = "SELECT * FROM dav_principal $where ORDER BY principal_id LIMIT 100";
$qry = new AwlQuery($sql); $qry = new AwlQuery($sql, $params);
$get_props = $xmltree->GetPath('/DAV::principal-property-search/DAV::prop/*'); $get_props = $xmltree->GetPath('/DAV::principal-property-search/DAV::prop/*');